Ignore sub-folders in 'META-INF/services'

fixes #45

Author: jjohannes

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Extra Java Module Info Gradle Plugin - Changelog
 
 ## Version 1.4
+* [Fixed] [#45](https://github.com/gradlex-org/extra-java-module-info/issues/45) - Sub-folders in 'META-INF/services' are not ignored (Thanks [Jonas Beyer](https://github.com/j-beyer) for reporting!)
 * [Fixed] [#44](https://github.com/gradlex-org/extra-java-module-info/issues/44) - Name resolution for jars with '-' character failing if Jars are taken from local .m2 repository (Thanks [Aidan Do](https://github.com/REslim30) for reporting!)
 
 ## Version 1.3

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

@@ -239,17 +239,20 @@ private void copyAndExtractProviders(JarInputStream inputStream, JarOutputStream
         while (jarEntry != null) {
             byte[] content = readAllBytes(inputStream);
             String entryName = jarEntry.getName();
-            boolean isServiceProviderFile = entryName.startsWith(SERVICES_PREFIX) && !entryName.equals(SERVICES_PREFIX);
-            if (isServiceProviderFile) {
+            boolean isFileInServicesFolder = entryName.startsWith(SERVICES_PREFIX) && !entryName.equals(SERVICES_PREFIX);
+            if (isFileInServicesFolder) {
                 String key = entryName.substring(SERVICES_PREFIX.length());
-                if (!providers.containsKey(key)) {
-                    providers.put(key, new ArrayList<>());
+                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));
                 }
-                providers.get(key).addAll(extractImplementations(content));
             }
 
             if (!JAR_SIGNATURE_PATH.matcher(entryName).matches() && !"META-INF/MANIFEST.MF".equals(jarEntry.getName())) {
-                if (!willMergeJars || !isServiceProviderFile) { // service provider files will be merged later
+                if (!willMergeJars || !isFileInServicesFolder) { // service provider files will be merged later
                     jarEntry.setCompressedSize(-1);
                     try {
                         outputStream.putNextEntry(jarEntry);

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

@@ -327,6 +327,35 @@ abstract class AbstractFunctionalTest extends Specification {
         run().task(':run').outcome == TaskOutcome.SUCCESS
     }
 
+    def "only takes well-defined services from META-INF/services"() {
+        given:
+        file("src/main/java/org/gradle/sample/app/Main.java") << """
+            package org.gradle.sample.app;
+
+            public class Main {
+                public static void main(String[] args) { }
+            }
+        """
+        file("src/main/java/module-info.java") << """
+            module org.gradle.sample.app {               
+                requires qpid.jms.client;                                                        
+            }
+        """
+        buildFile << """
+            dependencies {
+                implementation("org.apache.qpid:qpid-jms-client:2.2.0")                 
+            }
+            
+            extraJavaModuleInfo {
+                failOnMissingModuleInfo.set(false)
+                module("org.apache.qpid:qpid-jms-client", "qpid.jms.client")
+            }
+        """
+
+        expect:
+        run().task(':run').outcome == TaskOutcome.SUCCESS
+    }
+
     def "can add static/transitive 'requires' modifiers to legacy libraries"() {
         given:
         file("src/main/java/org/gradle/sample/app/Main.java") << """