Fix PublicSuffixMatcherLoader#getDefault (#621)

Author: joegallo

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);
 

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<PublicSuffixList> 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

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;
@@ -37,7 +38,10 @@
 public class TestPublicSuffixMatcherLoader {
 
     @Test
-    public void testGetDefault() {
-        assertNotNull(PublicSuffixMatcherLoader.getDefault());
+    void testGetDefault() {
+        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));
     }
 }