[Core] Pass class loader to ServiceLoader.load invocations

Fixes: #2217, #2219

Author: mpkorstanje

core/src/main/java/io/cucumber/core/runtime/BackendServiceLoader.java

@@ -29,7 +29,8 @@ public BackendServiceLoader(
 
     @Override
     public Collection<? extends Backend> get() {
-        return get(ServiceLoader.load(BackendProviderService.class));
+        ClassLoader classLoader = classLoaderSupplier.get();
+        return get(ServiceLoader.load(BackendProviderService.class, classLoader));
     }
 
     Collection<? extends Backend> get(Iterable<BackendProviderService> serviceLoader) {

core/src/main/java/io/cucumber/core/runtime/ObjectFactoryServiceLoader.java

@@ -9,16 +9,19 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.ServiceLoader;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.Objects.requireNonNull;
 
 public final class ObjectFactoryServiceLoader {
 
+    private final Supplier<ClassLoader> classLoaderSupplier;
     private final Options options;
 
-    public ObjectFactoryServiceLoader(Options options) {
+    public ObjectFactoryServiceLoader(Supplier<ClassLoader> classLoaderSupplier, Options options) {
+        this.classLoaderSupplier = requireNonNull(classLoaderSupplier);
         this.options = requireNonNull(options);
     }
 
@@ -38,9 +41,9 @@ public ObjectFactoryServiceLoader(Options options) {
      * @return an instance of {@link ObjectFactory}
      */
     ObjectFactory loadObjectFactory() {
-        Class<? extends ObjectFactory> objectFactoryClass = this.options.getObjectFactoryClass();
-
-        final ServiceLoader<ObjectFactory> loader = ServiceLoader.load(ObjectFactory.class);
+        Class<? extends ObjectFactory> objectFactoryClass = options.getObjectFactoryClass();
+        ClassLoader classLoader = classLoaderSupplier.get();
+        ServiceLoader<ObjectFactory> loader = ServiceLoader.load(ObjectFactory.class, classLoader);
         if (objectFactoryClass == null) {
             return loadSingleObjectFactoryOrDefault(loader);
 
@@ -50,7 +53,7 @@ ObjectFactory loadObjectFactory() {
     }
 
     private static ObjectFactory loadSingleObjectFactoryOrDefault(ServiceLoader<ObjectFactory> loader) {
-        final Iterator<ObjectFactory> objectFactories = loader.iterator();
+        Iterator<ObjectFactory> objectFactories = loader.iterator();
 
         ObjectFactory objectFactory;
         if (objectFactories.hasNext()) {
@@ -134,8 +137,8 @@ private <T> T cacheNewInstance(Class<T> type) {
                 return instance;
             } catch (NoSuchMethodException e) {
                 throw new CucumberException(String.format(
-                    "%s doesn't have an empty constructor. If you need dependency injection, put cucumber-picocontainer on the classpath",
-                    type), e);
+                        "%s doesn't have an empty constructor. If you need dependency injection, put cucumber-picocontainer on the classpath",
+                        type), e);
             } catch (Exception e) {
                 throw new CucumberException(String.format("Failed to instantiate %s", type), e);
             }

core/src/main/java/io/cucumber/core/runtime/Runtime.java

@@ -157,8 +157,7 @@ public Builder withEventBus(final EventBus eventBus) {
         }
 
         public Runtime build() {
-            final ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(
-                runtimeOptions);
+            final ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(classLoader, runtimeOptions);
 
             final ObjectFactorySupplier objectFactorySupplier = runtimeOptions.isMultiThreaded()
                     ? new ThreadLocalObjectFactorySupplier(objectFactoryServiceLoader)

core/src/test/java/io/cucumber/core/runtime/BackendServiceLoaderTest.java

@@ -5,6 +5,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
+import java.util.function.Supplier;
+
 import static java.util.Collections.emptyList;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -14,21 +16,20 @@
 
 class BackendServiceLoaderTest {
 
+    final RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
+    final Supplier<ClassLoader> classLoaderSupplier = this.getClass()::getClassLoader;
+    final ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(classLoaderSupplier, runtimeOptions);
+    final ObjectFactorySupplier objectFactory = new SingletonObjectFactorySupplier(objectFactoryServiceLoader);
+
     @Test
     void should_create_a_backend() {
-        RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
-        ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(runtimeOptions);
-        ObjectFactorySupplier objectFactory = new SingletonObjectFactorySupplier(objectFactoryServiceLoader);
-        BackendSupplier backendSupplier = new BackendServiceLoader(getClass()::getClassLoader, objectFactory);
+        BackendSupplier backendSupplier = new BackendServiceLoader(classLoaderSupplier, objectFactory);
         assertThat(backendSupplier.get().iterator().next(), is(notNullValue()));
     }
 
     @Test
     void should_throw_an_exception_when_no_backend_could_be_found() {
-        RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
-        ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(runtimeOptions);
-        ObjectFactorySupplier objectFactory = new SingletonObjectFactorySupplier(objectFactoryServiceLoader);
-        BackendServiceLoader backendSupplier = new BackendServiceLoader(getClass()::getClassLoader, objectFactory);
+        BackendServiceLoader backendSupplier = new BackendServiceLoader(classLoaderSupplier, objectFactory);
 
         Executable testMethod = () -> backendSupplier.get(emptyList()).iterator().next();
         CucumberException actualThrown = assertThrows(CucumberException.class, testMethod);

core/src/test/java/io/cucumber/core/runtime/SingletonRunnerSupplierTest.java

@@ -22,7 +22,7 @@ class SingletonRunnerSupplierTest {
     void before() {
         Supplier<ClassLoader> classLoader = SingletonRunnerSupplier.class::getClassLoader;
         RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
-        ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(runtimeOptions);
+        ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(classLoader, runtimeOptions);
         ObjectFactorySupplier objectFactory = new SingletonObjectFactorySupplier(objectFactoryServiceLoader);
         BackendServiceLoader backendSupplier = new BackendServiceLoader(getClass()::getClassLoader, objectFactory);
         EventBus eventBus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);

core/src/test/java/io/cucumber/core/runtime/ThreadLocalRunnerSupplierTest.java

@@ -31,7 +31,7 @@ class ThreadLocalRunnerSupplierTest {
     void before() {
         Supplier<ClassLoader> classLoader = ThreadLocalRunnerSupplierTest.class::getClassLoader;
         RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
-        ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(runtimeOptions);
+        ObjectFactoryServiceLoader objectFactoryServiceLoader = new ObjectFactoryServiceLoader(classLoader, runtimeOptions);
         ObjectFactorySupplier objectFactory = new SingletonObjectFactorySupplier(objectFactoryServiceLoader);
         BackendServiceLoader backendSupplier = new BackendServiceLoader(classLoader, objectFactory);
         eventBus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);