Skip to content

Commit 3938b67

Browse files
authored
Use URI::toURL to create URLs (#1382)
1 parent a341d00 commit 3938b67

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

cli/src/test/java/org/jboss/pnc/build/finder/cli/MainTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.jboss.pnc.build.finder.core.ChecksumType.sha256;
2121

2222
import java.io.IOException;
23+
import java.net.URI;
2324
import java.net.URL;
2425
import java.nio.file.Path;
2526
import java.util.Collection;
@@ -85,8 +86,8 @@ void testParsing(@TempDir Path folder) throws IOException {
8586
Path configFile = TestUtils.loadFile("config.json");
8687
Path inputFile = TestUtils.loadFile("nested.war");
8788

88-
URL hubURL = new URL("http://a.b");
89-
URL webURL = new URL("http://c.d");
89+
URL hubURL = URI.create("http://a.b").toURL();
90+
URL webURL = URI.create("http://c.d").toURL();
9091
Path krbCcache = folder.resolve("krb5-cache");
9192
Path krbKeytab = folder.resolve("krb5-keytab");
9293
String krbPassword = "test";

core/src/test/java/org/jboss/pnc/build/finder/core/CompletedAndDeletedBuildTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import java.net.MalformedURLException;
21-
import java.net.URL;
21+
import java.net.URI;
2222
import java.util.Collection;
2323
import java.util.Collections;
2424
import java.util.LinkedHashMap;
@@ -44,7 +44,7 @@ class CompletedAndDeletedBuildTest extends AbstractWireMockTest {
4444
@BeforeAll
4545
static void setup() throws MalformedURLException {
4646
config = new BuildConfig();
47-
config.setKojiHubURL(new URL(WIRE_MOCK_EXTENSION.baseUrl()));
47+
config.setKojiHubURL(URI.create(WIRE_MOCK_EXTENSION.baseUrl()).toURL());
4848
}
4949

5050
@Test

core/src/test/java/org/jboss/pnc/build/finder/core/CompletedBuildTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import java.net.MalformedURLException;
21-
import java.net.URL;
21+
import java.net.URI;
2222
import java.util.Collection;
2323
import java.util.Collections;
2424
import java.util.LinkedHashMap;
@@ -43,7 +43,7 @@ class CompletedBuildTest extends AbstractWireMockTest {
4343
@BeforeAll
4444
static void setup() throws MalformedURLException {
4545
config = new BuildConfig();
46-
config.setKojiHubURL(new URL(WIRE_MOCK_EXTENSION.baseUrl()));
46+
config.setKojiHubURL(URI.create(WIRE_MOCK_EXTENSION.baseUrl()).toURL());
4747
}
4848

4949
@Test

core/src/test/java/org/jboss/pnc/build/finder/core/DeletedBuildTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import java.net.MalformedURLException;
21-
import java.net.URL;
21+
import java.net.URI;
2222
import java.util.Collection;
2323
import java.util.Collections;
2424
import java.util.LinkedHashMap;
@@ -43,7 +43,7 @@ class DeletedBuildTest extends AbstractWireMockTest {
4343
@BeforeAll
4444
static void setup() throws MalformedURLException {
4545
config = new BuildConfig();
46-
config.setKojiHubURL(new URL(WIRE_MOCK_EXTENSION.baseUrl()));
46+
config.setKojiHubURL(URI.create(WIRE_MOCK_EXTENSION.baseUrl()).toURL());
4747
}
4848

4949
@Test

core/src/test/java/org/jboss/pnc/build/finder/core/EmptyBuildsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.io.IOException;
2121
import java.net.MalformedURLException;
22-
import java.net.URL;
22+
import java.net.URI;
2323
import java.util.Collection;
2424
import java.util.Collections;
2525
import java.util.LinkedHashMap;
@@ -44,7 +44,7 @@ class EmptyBuildsTest extends AbstractWireMockTest {
4444
@BeforeAll
4545
static void setup() throws MalformedURLException {
4646
config = new BuildConfig();
47-
config.setKojiHubURL(new URL(WIRE_MOCK_EXTENSION.baseUrl()));
47+
config.setKojiHubURL(URI.create(WIRE_MOCK_EXTENSION.baseUrl()).toURL());
4848
}
4949

5050
@Test

core/src/test/java/org/jboss/pnc/build/finder/core/SkipImportTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import java.net.MalformedURLException;
21-
import java.net.URL;
21+
import java.net.URI;
2222
import java.util.Collection;
2323
import java.util.Collections;
2424
import java.util.LinkedHashMap;
@@ -43,7 +43,7 @@ class SkipImportTest extends AbstractWireMockTest {
4343
@BeforeAll
4444
static void setup() throws MalformedURLException {
4545
config = new BuildConfig();
46-
config.setKojiHubURL(new URL(WIRE_MOCK_EXTENSION.baseUrl()));
46+
config.setKojiHubURL(URI.create(WIRE_MOCK_EXTENSION.baseUrl()).toURL());
4747
}
4848

4949
@Test

core/src/test/java/org/jboss/pnc/build/finder/core/SpdxLicenseUtilsTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.io.IOException;
2323
import java.io.InputStream;
24+
import java.net.URI;
2425
import java.net.URL;
2526
import java.nio.file.Files;
2627
import java.nio.file.Path;
@@ -162,7 +163,7 @@ void testFindMatchingSPDXLicenseIdentifier() {
162163

163164
@Test
164165
void testGetMatchingLicense(@TempDir Path folder) throws IOException, InvalidSPDXAnalysisException {
165-
URL url = new URL("https://www.apache.org/licenses/LICENSE-2.0.txt");
166+
URL url = URI.create("https://www.apache.org/licenses/LICENSE-2.0.txt").toURL();
166167
Path path = folder.resolve("LICENSE-2.0-1.txt");
167168

168169
try (InputStream in = url.openStream()) {

0 commit comments

Comments
 (0)