Add support for ServiceFinder on PackageNamesScanner

core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScanner.java

@@ -46,11 +46,14 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.AccessController;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.glassfish.jersey.internal.OsgiRegistry;
+import org.glassfish.jersey.internal.ServiceFinder;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.Tokenizer;
 import org.glassfish.jersey.server.internal.AbstractResourceFinderAdapter;
@@ -130,15 +133,19 @@ public PackageNamesScanner(final ClassLoader classLoader, final String[] package
         this.classloader = classLoader;
 
         this.finderFactories = new HashMap<>();
-        add(new JarZipSchemeResourceFinderFactory());
-        add(new FileSchemeResourceFinderFactory());
-        add(new VfsSchemeResourceFinderFactory());
-        add(new BundleSchemeResourceFinderFactory());
 
-        // TODO - Services?
-        // for (UriSchemeResourceFinderFactory s : ServiceFinder.find(UriSchemeResourceFinderFactory.class)) {
-        //     add(s);
-        // }
+        ServiceFinder<UriSchemeResourceFinderFactory> servicesFound = ServiceFinder.find(UriSchemeResourceFinderFactory.class);
+
+        // TODO: ServiceFinder should return an Optional
+        if (servicesFound.toArray().length == 0) {
+            for (UriSchemeResourceFinderFactory s : defaultFinderFactories()) {
+                add(s);
+            }
+        } else {
+            for (UriSchemeResourceFinderFactory s : servicesFound) {
+                add(s);
+            }
+        }
 
         final OsgiRegistry osgiRegistry = ReflectionHelper.getOsgiRegistryInstance();
         if (osgiRegistry != null) {
@@ -339,4 +346,13 @@ private String toExternalForm(final URL u) {
         }
         return result.toString();
     }
+
+    private static final Collection<UriSchemeResourceFinderFactory> defaultFinderFactories() {
+        return Arrays.asList(
+                new JarZipSchemeResourceFinderFactory(),
+                new FileSchemeResourceFinderFactory(),
+                new VfsSchemeResourceFinderFactory(),
+                new BundleSchemeResourceFinderFactory()
+        );
+    }
 }