Pass ServiceLoader to Utils to avoid failing its caller check

When used on the module path, `ServiceLoader` determines its calling
module from the stack and check whether its module descriptor contains a
`uses` directive for the service type. If not, it will throw an
exception. Therefore, `ServiceLoader.load` needs to be called directly
in the module using the service but the filtering can still occur in
junit-platform-commons.

Author: marcphilipp

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java

@@ -102,7 +102,9 @@ private static void registerAutoDetectedExtensions(MutableExtensionRegistry exte
 			configuration.getExtensionAutodetectionIncludePattern().orElse("*"),
 			configuration.getExtensionAutodetectionExcludePattern().orElse(""));
 
-		ServiceLoaderUtils.load(Extension.class, filter, ClassLoaderUtils.getDefaultClassLoader()) //
+		ServiceLoader<Extension> serviceLoader = ServiceLoader.load(Extension.class,
+			ClassLoaderUtils.getDefaultClassLoader());
+		ServiceLoaderUtils.filter(serviceLoader, filter) //
 				.forEach(extensionRegistry::registerAutoDetectedExtension);
 	}
 

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ServiceLoaderUtils.java

@@ -36,17 +36,16 @@ private ServiceLoaderUtils() {
 	}
 
 	/**
-	 * Loads services of the given type using the specified class loader and filters them using the provided predicate.
+	 * Filters the supplied service loader using the supplied predicate.
 	 *
 	 * @param <T> the type of the service
-	 * @param service the class of the service to be loaded
+	 * @param serviceLoader the service loader to be filtered
 	 * @param providerPredicate the predicate to filter the loaded services
-	 * @param loader the class loader to be used to load the services
 	 * @return a stream of loaded services that match the predicate
 	 */
-	public static <T> Stream<T> load(Class<T> service, Predicate<? super Class<? extends T>> providerPredicate,
-			ClassLoader loader) {
-		return StreamSupport.stream(ServiceLoader.load(service, loader).spliterator(), false).filter(it -> {
+	public static <T> Stream<T> filter(ServiceLoader<T> serviceLoader,
+			Predicate<? super Class<? extends T>> providerPredicate) {
+		return StreamSupport.stream(serviceLoader.spliterator(), false).filter(it -> {
 			@SuppressWarnings("unchecked")
 			Class<? extends T> type = (Class<? extends T>) it.getClass();
 			return providerPredicate.test(type);

junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ServiceLoaderUtils.java

@@ -36,18 +36,17 @@ private ServiceLoaderUtils() {
 	}
 
 	/**
-	 * Loads services of the given type using the specified class loader and filters them using the provided predicate.
+	 * Filters the supplied service loader using the supplied predicate.
 	 *
 	 * @param <T> the type of the service
-	 * @param service the class of the service to be loaded
+	 * @param serviceLoader the service loader to be filtered
 	 * @param providerPredicate the predicate to filter the loaded services
-	 * @param loader the class loader to be used to load the services
 	 * @return a stream of loaded services that match the predicate
 	 */
-	public static <T> Stream<T> load(Class<T> service, Predicate<? super Class<? extends T>> providerPredicate,
-			ClassLoader loader) {
+	public static <T> Stream<T> filter(ServiceLoader<T> serviceLoader,
+			Predicate<? super Class<? extends T>> providerPredicate) {
 		// @formatter:off
-		return ServiceLoader.load(service, loader)
+		return serviceLoader
 				.stream()
 				.filter(provider -> providerPredicate.test(provider.type()))
 				.map(ServiceLoader.Provider::get);

junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java

@@ -14,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ServiceLoader;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
@@ -54,9 +55,9 @@ private static <T> String logLoadedInstances(Class<T> type, List<T> instances, L
 
 	private static <T> List<T> load(Class<T> type, Predicate<String> classNameFilter,
 			Function<List<T>, String> logMessageSupplier) {
+		ServiceLoader<T> serviceLoader = ServiceLoader.load(type, ClassLoaderUtils.getDefaultClassLoader());
 		Predicate<Class<? extends T>> providerPredicate = clazz -> classNameFilter.test(clazz.getName());
-		List<T> instances = ServiceLoaderUtils.load(type, providerPredicate, ClassLoaderUtils.getDefaultClassLoader()) //
-				.collect(toList());
+		List<T> instances = ServiceLoaderUtils.filter(serviceLoader, providerPredicate).collect(toList());
 		getLogger().config(() -> logMessageSupplier.apply(instances));
 		return instances;
 	}