Fixing Module.getModuleResources

Author: fabapp2

components/sbm-core/src/main/java/org/springframework/sbm/build/api/Module.java

@@ -145,9 +145,26 @@ public <T> T search(ProjectResourceFinder<T> finder) {
     }
 
     private List<RewriteSourceFileHolder<? extends SourceFile>> getModuleResources() {
-        return projectResourceSet.stream()
-                .filter(r -> r.getAbsolutePath().toString().startsWith(projectRootDir.resolve(modulePath).toString()))
+        List<Path> moduleSourceSets = new ArrayList<>();
+        moduleSourceSets.addAll(buildFile.getSourceFolders()); // src/main/java, src/gen/java --> /module1/src/main/java
+        moduleSourceSets.addAll(buildFile.getResourceFolders());
+        moduleSourceSets.addAll(buildFile.getTestSourceFolders());
+        moduleSourceSets.addAll(buildFile.getTestResourceFolders());
+
+        List<RewriteSourceFileHolder<? extends SourceFile>> moduleResources = moduleSourceSets
+                .stream()
+                .flatMap(p -> projectResourceSet.stream().filter(r -> this.isResourceOnPath(r, p)))
                 .collect(Collectors.toList());
+        // add pom.xml as it is not part of any source set
+        moduleResources.add((OpenRewriteMavenBuildFile)getBuildFile());
+        return moduleResources;
+    }
+
+    /**
+     * Decides if a given {@code resource} is on the given {@code path}.
+     */
+    private boolean isResourceOnPath(RewriteSourceFileHolder<? extends SourceFile> resource, Path path) {
+         return resource.getAbsolutePath().toString().startsWith(path.toString());
     }
 
     public <T> T searchMainResources(ProjectResourceFinder<T> finder) {
@@ -175,7 +192,7 @@ public <T> T searchTestJava(ProjectResourceFinder<T> finder) {
      */
     public boolean contains(Path resourcePath) {
         Verify.absolutePath(resourcePath);
-        return getModuleResources().stream().anyMatch(r -> r.getAbsolutePath().toString().equals(resourcePath.toString()));
+        return getModuleResources().stream().anyMatch(r -> r.getAbsolutePath().equals(resourcePath));
     }
 
     /**

components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_getModuleResources_Test.java renamed to components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_contains_Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
-class Module_getModuleResources_Test {
+class Module_contains_Test {
     @Test
     void singleModuleProject() {
         String rootPom = PomBuilder
@@ -78,6 +78,9 @@ void multiModuleProject() {
 
         String module2Pom = PomBuilder.buiildPom("com.example:parent:1.0", "module2").build();
 
+        String moduleInModule1Pom = PomBuilder.buiildPom("com.example:parent:1.0", "module-in-module1").build();
+
+
         String javaClass = """
                 package com.example;
                 public class SomeClass {}
@@ -86,35 +89,51 @@ public class SomeClass {}
                 package com.example;
                 public class SomeClassTest {}
                 """;
+
+        // shares module path of module1 and module1/module-in-module1
+        String sourcePathString = "module1/module-in-module1/src/main/resources/module-in-module1.txt";
+
         ProjectContext context = TestProjectContext
                 .buildProjectContext()
+                // parent module
+                .withMavenBuildFileSource("pom.xml", rootPom)
+                .addProjectResource("not-in-source-set.txt", "")
+                // module1
                 .withMavenBuildFileSource("module1/pom.xml", module1Pom)
                 .addJavaSource("module1/src/test/java", testjavaClass)
                 .addProjectResource("module1/src/test/resources/test-resource-found.txt", "")
-
+                // module-in-module1
+                .withMavenBuildFileSource("module1/module-in-module1/pom.xml", moduleInModule1Pom)
+                .addProjectResource(sourcePathString, "")
+                // module2
                 .withMavenBuildFileSource("module2/pom.xml", module2Pom)
                 .addJavaSource("module2/src/main/java", javaClass)
                 .addProjectResource("module2/src/main/resources/resource-found.txt", "")
 
-                .withMavenBuildFileSource("pom.xml", rootPom)
-                .addProjectResource("not-in-source-set.txt", "")
-
-
                 .build();
 
         Module root = context.getApplicationModules().getModule("root");
         Path rootPath = TestProjectContext.getDefaultProjectRoot();
         assertThat(root.contains(rootPath.resolve("pom.xml"))).isTrue();
         assertThat(root.contains(rootPath.resolve("src/main/java/com/example/SomeClass.java"))).isFalse();
+        assertThat(root.contains(rootPath.resolve("not-in-source-set.txt"))).isFalse();
 
-        Module module1 = context.getApplicationModules().getModule("module2");
+        Module module1 = context.getApplicationModules().getModule("module1");
 
-        assertThat(module1.contains(rootPath.resolve("module2//main/java/com/example/SomeClass.java"))).isFalse();
-        assertThat(
-                module1.contains(rootPath.resolve("module2/src/test/java/com/example/SomeClassTest.java"))).isFalse();
-        assertThat(module1.contains(rootPath.resolve("module2/src/main/resources/resource-found.txt"))).isTrue();
-        assertThat(root.contains(rootPath.resolve("src/test/resources/test-resource-found.txt"))).isFalse();
-        assertThat(root.contains(rootPath.resolve("not-in-source-set.txt"))).isFalse();
+        // precondition
+        Path resourceInSubmodule = rootPath.resolve(sourcePathString);
+        assertThat(context.getProjectResources().stream().anyMatch(r -> r.getAbsolutePath().equals(resourceInSubmodule))).isTrue();
+
+        assertThat(module1.contains(rootPath.resolve(sourcePathString))).isFalse();
+        Module moduleInModule1 = context.getApplicationModules().getModule("module1/module-in-module1");
+        assertThat(moduleInModule1.contains(resourceInSubmodule)).isTrue();
+
+        assertThat(module1.contains(rootPath.resolve("module1/src/test/java/com/example/SomeClassTest.java"))).isTrue();
+        assertThat(module1.contains(rootPath.resolve("module1/src/test/resources/test-resource-found.txt"))).isTrue();
+
+        Module module2 = context.getApplicationModules().getModule("module2");
+        assertThat(module2.contains(rootPath.resolve("module2/main/java/com/example/SomeClass.java"))).isFalse();
+        assertThat(module2.contains(rootPath.resolve("module2/src/main/resources/resource-found.txt"))).isTrue();
     }
 
     @Test

components/sbm-recipes-mule-to-boot/src/main/java/org/springframework/sbm/mule/resource/MuleXmlProjectResourceRegistrar.java

@@ -38,6 +38,8 @@ public boolean shouldHandle(RewriteSourceFileHolder<? extends SourceFile> rewrit
 
     @Override
     public MuleXml wrapRewriteSourceFileHolder(RewriteSourceFileHolder<? extends SourceFile> rewriteSourceFileHolder) {
+
+
         Parser.Input input = new Parser.Input(rewriteSourceFileHolder.getAbsolutePath(), () -> new ByteArrayInputStream(rewriteSourceFileHolder.print().getBytes(StandardCharsets.UTF_8)));
         List<Xml.Document> documents = new XmlParser().parseInputs(List.of(input), rewriteSourceFileHolder.getAbsoluteProjectDir(), new RewriteExecutionContext());
         return new MuleXml(rewriteSourceFileHolder.getAbsoluteProjectDir(), documents.get(0));