#215 - TestModules when loaded with module path via META-INF/services need de-duplication

Author: rbygrave

blackbox-test-inject/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>8.3</version>
+    <version>8.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

inject-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.3</version>
+    <version>8.4</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>8.3</version>
+      <version>8.4</version>
     </dependency>
 
     <!-- test dependencies -->

inject-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.3</version>
+    <version>8.4</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>
@@ -124,7 +124,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-inject-generator</artifactId>
-              <version>8.3</version>
+              <version>8.4</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

inject-test/src/main/java/io/avaje/inject/test/TSBuild.java

@@ -9,10 +9,7 @@
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.ServiceLoader;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -83,15 +80,18 @@ private BeanScope buildFromModules(List<TestModule> testModules) {
   @Nullable
   private BeanScope buildFromResources() {
     try {
-      List<TestModule> testModules = new ArrayList<>();
+      Set<Class<?>> testModuleClasses = new LinkedHashSet<>();
       Enumeration<URL> urls = ClassLoader.getSystemResources("META-INF/services/io.avaje.inject.test.TestModule");
       while (urls.hasMoreElements()) {
         String className = readServiceClassName(urls.nextElement());
         if (className != null) {
-          Class<?> cls = Class.forName(className);
-          testModules.add((TestModule) cls.getDeclaredConstructor().newInstance());
+          testModuleClasses.add(Class.forName(className));
         }
       }
+      List<TestModule> testModules = new ArrayList<>();
+      for (Class<?> cls : testModuleClasses) {
+        testModules.add((TestModule) cls.getDeclaredConstructor().newInstance());
+      }
       return testModules.isEmpty() ? null : buildFromModules(testModules);
     } catch (Throwable e) {
       throw new RuntimeException("Error trying to create TestModule", e);

inject/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>8.3</version>
+    <version>8.4</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>8.3</version>
+  <version>8.4</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>