Support modules in nested folders inside a dircetory

Author: jjohannes

src/main/java/org/gradlex/javamodule/dependencies/initialization/Directory.java

@@ -46,15 +46,19 @@ public void plugin(String id) {
         getPlugins().add(id);
     }
 
-    public void module(String moduleFolder, Action<Module> action) {
-        Module module = addModule(moduleFolder);
+    public void module(String subDirectory) {
+        module(subDirectory, m -> {});
+    }
+
+    public void module(String subDirectory, Action<Module> action) {
+        Module module = addModule(subDirectory);
         action.execute(module);
-        customizedModules.put(moduleFolder, module);
+        customizedModules.put(subDirectory, module);
     }
 
-    Module addModule(String moduleFolder) {
+    Module addModule(String subDirectory) {
         Module module = getObjects().newInstance(Module.class, root);
-        module.getDirectory().convention(moduleFolder);
+        module.getDirectory().convention(subDirectory);
         module.getGroup().convention(getGroup());
         module.getPlugins().addAll(getPlugins());
         return module;

src/main/java/org/gradlex/javamodule/dependencies/initialization/JavaModulesExtension.java

@@ -38,6 +38,7 @@
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Map;
 
 public abstract class JavaModulesExtension {
 
@@ -69,18 +70,21 @@ public void directory(String path) {
     }
 
     public void directory(String path, Action<Directory> action) {
-        Directory directory = getObjects().newInstance(Directory.class, new File(settings.getRootDir(), path));
+        File modulesDirectory = new File(settings.getRootDir(), path);
+        Directory directory = getObjects().newInstance(Directory.class, modulesDirectory);
         action.execute(directory);
 
-        File[] projectDirs = new File(settings.getRootDir(), path).listFiles();
+        File[] projectDirs = modulesDirectory.listFiles();
         if (projectDirs == null) {
-            throw new RuntimeException("Failed to inspect: " + new File(settings.getRootDir(), path));
+            throw new RuntimeException("Failed to inspect: " + modulesDirectory);
+        }
+
+        for (Module module : directory.customizedModules.values()) {
+            includeModule(module, new File(modulesDirectory, module.getDirectory().get()));
         }
 
         for (File projectDir : projectDirs) {
-            if (directory.customizedModules.containsKey(projectDir.getName())) {
-                includeModule(directory.customizedModules.get(projectDir.getName()), projectDir);
-            } else {
+            if (!directory.customizedModules.containsKey(projectDir.getName())) {
                 includeModule(directory.addModule(projectDir.getName()), projectDir);
             }
         }