Jar merge: do not remove folders in 'META-INF/services'

Follow up to #45

Author: jjohannes

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java

@@ -243,16 +243,15 @@ private void copyAndExtractProviders(JarInputStream inputStream, JarOutputStream
         while (jarEntry != null) {
             byte[] content = readAllBytes(inputStream);
             String entryName = jarEntry.getName();
-            boolean isFileInServicesFolder = entryName.startsWith(SERVICES_PREFIX) && !entryName.equals(SERVICES_PREFIX);
+            boolean isFileInServicesFolder = entryName.startsWith(SERVICES_PREFIX)
+                    && !entryName.equals(SERVICES_PREFIX)
+                    && !entryName.substring(SERVICES_PREFIX.length()).contains("/"); // ignore files in sub-folders
             if (isFileInServicesFolder) {
                 String key = entryName.substring(SERVICES_PREFIX.length());
-                boolean isServiceProviderFile = !key.contains("/"); // ignore files in sub-folders
-                if (isServiceProviderFile) {
-                    if (!providers.containsKey(key)) {
-                        providers.put(key, new ArrayList<>());
-                    }
-                    providers.get(key).addAll(extractImplementations(content));
+                if (!providers.containsKey(key)) {
+                    providers.put(key, new ArrayList<>());
                 }
+                providers.get(key).addAll(extractImplementations(content));
             }
 
             if (!JAR_SIGNATURE_PATH.matcher(entryName).matches() && !"META-INF/MANIFEST.MF".equals(jarEntry.getName())) {

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/AbstractFunctionalTest.groovy

@@ -331,9 +331,14 @@ abstract class AbstractFunctionalTest extends Specification {
         given:
         file("src/main/java/org/gradle/sample/app/Main.java") << """
             package org.gradle.sample.app;
+            
+            import org.apache.qpid.jms.JmsConnection;
 
             public class Main {
-                public static void main(String[] args) { }
+                public static void main(String[] args) { 
+                    // Make sure files in '/META-INF/services/' that are not service provider entries are preserved
+                    JmsConnection.class.getResource("/META-INF/services/org/apache/qpid/jms/provider/amqp").toString();
+                }
             }
         """
         file("src/main/java/module-info.java") << """
@@ -347,8 +352,47 @@ abstract class AbstractFunctionalTest extends Specification {
             }
             
             extraJavaModuleInfo {
-                failOnMissingModuleInfo.set(false)
-                module(${libs.qpidJmsClient}, "qpid.jms.client")
+                module(${libs.qpidJmsClient}, "qpid.jms.client") {
+                    exports("org.apache.qpid.jms")
+                    requires("jakarta.messaging")
+                }
+            }
+        """
+
+        expect:
+        run().task(':run').outcome == TaskOutcome.SUCCESS
+    }
+
+    def "only takes well-defined services from META-INF/services (merge Jar)"() {
+        given:
+        file("src/main/java/org/gradle/sample/app/Main.java") << """
+            package org.gradle.sample.app;
+            
+            import org.apache.qpid.jms.JmsConnection;
+
+            public class Main {
+                public static void main(String[] args) { 
+                    // Make sure files in '/META-INF/services/' that are not service provider entries are preserved
+                    JmsConnection.class.getResource("/META-INF/services/org/apache/qpid/jms/provider/amqp").toString();
+                }
+            }
+        """
+        file("src/main/java/module-info.java") << """
+            module org.gradle.sample.app {               
+                requires qpid.jms.discovery;                                                        
+            }
+        """
+        buildFile << """
+            dependencies {
+                implementation("org.apache.qpid:qpid-jms-discovery:2.2.0")
+            }
+            
+            extraJavaModuleInfo {
+                module(${libs.qpidJmsDiscovery}, "qpid.jms.discovery") {
+                    exports("org.apache.qpid.jms")
+                    requires("jakarta.messaging")
+                    mergeJar("org.apache.qpid:qpid-jms-client")
+                }
             }
         """
 

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/fixture/LegacyLibraries.groovy

@@ -21,6 +21,7 @@ class LegacyLibraries {
     def jsr305 = jarNameOnly ? '"jsr305-3.0.2.jar"' : aliases ? 'libs.jsr305' : '"com.google.code.findbugs:jsr305"'
     def log4jCore = jarNameOnly ? '"log4j-core-2.14.0.jar"' : aliases ? 'libs.log4j.core' : '"org.apache.logging.log4j:log4j-core"'
     def qpidJmsClient = jarNameOnly ? '"qpid-jms-client-2.2.0.jar"' : aliases ? 'libs.qpid.jms.client' : '"org.apache.qpid:qpid-jms-client"'
+    def qpidJmsDiscovery = jarNameOnly ? '"qpid-jms-discovery-2.2.0.jar"' : aliases ? 'libs.qpid.jms.discovery' : '"org.apache.qpid:qpid-jms-discovery"'
     def sac = jarNameOnly ? '"sac-1.3.jar"' : aliases ? 'libs.sac' : '"org.w3c.css:sac"'
     def slf4jApi = jarNameOnly ? '"slf4j-api-1.7.32.jar"' : aliases ? 'libs.slf4j.api' : '"org.slf4j:slf4j-api"'
     def slf4jExt = jarNameOnly ? '"slf4j-ext-1.7.32.jar"' : aliases ? 'libs.slf4j.ext' : '"org.slf4j:slf4j-ext"'
@@ -45,6 +46,7 @@ class LegacyLibraries {
             ${alias(aliases.jsr305)} = '${unquote(coordinates.jsr305)}:1'
             ${alias(aliases.log4jCore)} = '${unquote(coordinates.log4jCore)}:1'
             ${alias(aliases.qpidJmsClient)} = '${unquote(coordinates.qpidJmsClient)}:1'
+            ${alias(aliases.qpidJmsDiscovery)} = '${unquote(coordinates.qpidJmsDiscovery)}:1'
             ${alias(aliases.sac)} = '${unquote(coordinates.sac)}:1'
             ${alias(aliases.slf4jApi)} = '${unquote(coordinates.slf4jApi)}:1'
             ${alias(aliases.slf4jExt)} = '${unquote(coordinates.slf4jExt)}:1'