diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java index ef3abbda46..1c2022890b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java @@ -51,7 +51,7 @@ @Contract(threading = ThreadingBehavior.SAFE) public final class PublicSuffixMatcherLoader { - private static final String PUBLIC_SUFFIX_LIST = "org/publicsuffix/list/effective_tld_names.dat"; + private static final String PUBLIC_SUFFIX_LIST = "/org/publicsuffix/list/effective_tld_names.dat"; private static final Logger LOG = LoggerFactory.getLogger(PublicSuffixMatcherLoader.class); diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java index c56229d1f7..b2709d9962 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java @@ -29,7 +29,6 @@ import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.List; @@ -40,7 +39,6 @@ class TestPublicSuffixMatcher { private static final String SOURCE_FILE = "suffixlistmatcher.txt"; - private static final String PUBLIC_SUFFIX_LIST_FILE = "org/publicsuffix/list/effective_tld_names.dat"; private PublicSuffixMatcher matcher; private PublicSuffixMatcher pslMatcher; @@ -60,9 +58,7 @@ void setUp() throws Exception { final List lists = PublicSuffixListParser.INSTANCE.parseByType(new InputStreamReader(in, StandardCharsets.UTF_8)); matcher = new PublicSuffixMatcher(lists); } - final URL publicSuffixListUrl = classLoader.getResource(PUBLIC_SUFFIX_LIST_FILE); - Assertions.assertNotNull(publicSuffixListUrl, PUBLIC_SUFFIX_LIST_FILE); - pslMatcher = PublicSuffixMatcherLoader.load(publicSuffixListUrl); + pslMatcher = PublicSuffixMatcherLoader.getDefault(); } @Test diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcherLoader.java b/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcherLoader.java index 566f6e6ea7..35cb54896e 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcherLoader.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcherLoader.java @@ -27,6 +27,7 @@ package org.apache.hc.client5.http.psl; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.junit.jupiter.api.Test; @@ -38,7 +39,10 @@ class TestPublicSuffixMatcherLoader { @Test void testGetDefault() { - assertNotNull(PublicSuffixMatcherLoader.getDefault()); + final PublicSuffixMatcher defaultMatcher = PublicSuffixMatcherLoader.getDefault(); + assertNotNull(defaultMatcher); + // check for an expected-to-be-stable entry in the PUBLIC_SUFFIX_LIST + assertEquals("example.net", defaultMatcher.getDomainRoot("example.net", DomainType.ICANN)); } }