WIP #304

Author: fabapp2

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

@@ -32,10 +32,13 @@
 import org.openrewrite.SourceFile;
 
 import java.nio.file.Path;
+import java.nio.file.PathMatcher;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @RequiredArgsConstructor
 public class ApplicationModule {
@@ -112,6 +115,11 @@ public ResourceSet getMainResourceSet() {
         return new ResourceSet(projectResourceSet, projectRootDir, modulePath, mainResourceSet);
     }
 
+    public ResourceSet getTestResourceSet() {
+        Path testResourceSet = buildFile.getTestResourceFolder();
+        return new ResourceSet(projectResourceSet, projectRootDir, modulePath, testResourceSet);
+    }
+
     public List<ApplicationModule> getModules() {
         Optional<MavenResolutionResult> mavenResolution = MavenBuildFileUtil.findMavenResolution(((OpenRewriteMavenBuildFile) buildFile).getSourceFile());
         List<MavenResolutionResult> modulesMarker = mavenResolution.get().getModules();
@@ -145,4 +153,47 @@ private List<RewriteSourceFileHolder<? extends SourceFile>> getModuleResources()
                 .filter(r -> r.getAbsolutePath().toString().startsWith(projectRootDir.resolve(modulePath).toString()))
                 .collect(Collectors.toList());
     }
+
+    public <T> T searchMainResources(ProjectResourceFinder<T> finder) {
+        ProjectResourceSet resourceSet = new ImmutableFilteringProjectResourceSet(projectResourceSet, (RewriteSourceFileHolder<? extends SourceFile> r) -> r.getAbsolutePath().normalize().startsWith(getMainResourceSet().getAbsolutePath().toAbsolutePath().normalize()));
+        return finder.apply(resourceSet);
+    }
+
+    public <T> T searchMainJava(ProjectResourceFinder<T> finder) {
+        ProjectResourceSet resourceSet = new ImmutableFilteringProjectResourceSet(projectResourceSet, (RewriteSourceFileHolder<? extends SourceFile> r) -> r.getAbsolutePath().normalize().startsWith(getMainJavaSourceSet().getAbsolutePath().toAbsolutePath().normalize()));
+        return finder.apply(resourceSet);
+    }
+
+    public <T> T searchTestResources(ProjectResourceFinder<T> finder) {
+        ProjectResourceSet resourceSet = new ImmutableFilteringProjectResourceSet(projectResourceSet, (RewriteSourceFileHolder<? extends SourceFile> r) -> r.getAbsolutePath().normalize().startsWith(getTestResourceSet().getAbsolutePath().toAbsolutePath().normalize()));
+        return finder.apply(resourceSet);
+    }
+
+    public <T> T searchTestJava(ProjectResourceFinder<T> finder) {
+        ProjectResourceSet resourceSet = new ImmutableFilteringProjectResourceSet(projectResourceSet, (RewriteSourceFileHolder<? extends SourceFile> r) -> r.getAbsolutePath().normalize().startsWith(getTestJavaSourceSet().getAbsolutePath().toAbsolutePath().normalize()));
+        return finder.apply(resourceSet);
+    }
+
+    /**
+     * Class provides filtering on the list of resources in a {@code ProjectResourceSet}.
+     * As all read methods rely on {@code stream()}, only this stream has to be filtered. :fingers_crossed:
+     *
+     * It's a private inner class as it is currently only used here and quite hacky overwriting only parts of
+     * {@code ProjectResourceSet} with a lot of assumptions of the inner workings of other classes.
+     */
+    private class ImmutableFilteringProjectResourceSet extends ProjectResourceSet{
+        private final ProjectResourceSet projectResourceSet;
+        private final Predicate<RewriteSourceFileHolder<? extends SourceFile>> predicate;
+
+        public ImmutableFilteringProjectResourceSet(ProjectResourceSet projectResourceSet, Predicate<RewriteSourceFileHolder<? extends SourceFile>> predicate) {
+            this.projectResourceSet = projectResourceSet;
+            this.predicate = predicate;
+        }
+
+        @Override
+        public Stream<RewriteSourceFileHolder<? extends SourceFile>> stream() {
+            return projectResourceSet.stream()
+                    .filter(this.predicate);
+        }
+    }
 }

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

@@ -19,6 +19,7 @@
 import org.openrewrite.maven.tree.MavenResolutionResult;
 import org.springframework.sbm.build.impl.MavenBuildFileUtil;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
+import org.springframework.sbm.project.resource.filter.ProjectResourceFinder;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -130,4 +131,5 @@ private boolean noOtherPomDependsOn(BuildFile buildFile) {
     public boolean isSingleModuleApplication() {
         return modules.size() == 1;
     }
+
 }

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

@@ -85,16 +85,20 @@ public interface BuildFile extends ProjectResource {
 
     void addPlugin(Plugin plugin);
 
+    List<Path> getClasspath();
+
     List<Path> getSourceFolders();
 
     List<Path> getTestSourceFolders();
 
     List<Path> getResourceFolders();
 
-    List<Path> getClasspath();
-
     List<Path> getTestResourceFolders();
 
+    Path getTestResourceFolder();
+
+    Path getMainResourceFolder();
+
     void setProperty(String key, String value);
 
     String getProperty(String key);
@@ -131,10 +135,8 @@ public interface BuildFile extends ProjectResource {
     Optional<ParentDeclaration> getParentPomDeclaration();
 
     Optional<String> getName();
-
-    Path getMainResourceFolder();
-
     // TODO: add same method to ApplicationModules to add excludes to all relevant dependencies in all BuildFiles
+
     /**
      * Adds an exclusion for each of the dependencies in {@code excludedDependencies} to all declared dependencies in this {@code BuildFile} which transitively depend on it.
      */

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

@@ -49,4 +49,5 @@ public interface JavaSourceSet {
 
     JavaSourceLocation getJavaSourceLocation();
 
+    Path getAbsolutePath();
 }

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

@@ -32,7 +32,7 @@ public class ResourceSet {
     private final Path resourceSetPath;
 
     public void addStringResource(String filePath, String content) {
-        Path absFilePath = this.projectRoot.resolve(resourceSetPath).resolve(filePath);
+        Path absFilePath = getAbsolutePath().resolve(filePath);
         StringProjectResource resource = new StringProjectResource(projectRoot, absFilePath, content);
         resource.markAsChanged();
         projectResourceSet.add(resource);
@@ -42,4 +42,8 @@ public void addResource(RewriteSourceFileHolder<? extends SourceFile> resource)
         resource.markChanged();
         projectResourceSet.add(resource);
     }
+
+    public Path getAbsolutePath() {
+        return projectRoot.resolve(resourceSetPath);
+    }
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/JavaSourceSetImpl.java

@@ -124,6 +124,11 @@ public JavaSourceLocation getJavaSourceLocation() {
         return new JavaSourceLocation(sourceSetRoot, basePackage);
     }
 
+    @Override
+    public Path getAbsolutePath() {
+        return sourceSetRoot;
+    }
+
     @Override
     public boolean hasImportStartingWith(String... value) {
         return false;

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenBuildFile.java

@@ -699,6 +699,11 @@ public Path getMainResourceFolder() {
         return getResourceFolders().get(0);
     }
 
+    @Override
+    public Path getTestResourceFolder() {
+        return getTestResourceFolders().get(0);
+    }
+
     @Override
     public void excludeDependencies(List<Dependency> excludedDependencies) {
         excludeDependenciesInner(excludedDependencies);

components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoDependencyExistMatchingRegex.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.build.migration.conditions;
 
+import org.springframework.sbm.build.api.ApplicationModule;
 import org.springframework.sbm.engine.recipe.Condition;
 import org.springframework.sbm.engine.context.ProjectContext;
 import lombok.*;
@@ -40,7 +41,9 @@ public String getDescription() {
     @Override
     public boolean evaluate(ProjectContext context) {
         return dependencies.stream().noneMatch(d ->
-                context.getBuildFile().hasDeclaredDependencyMatchingRegex(d)
+                context.getModules().stream()
+                        .map(ApplicationModule::getBuildFile)
+                        .noneMatch(b -> b.hasDeclaredDependencyMatchingRegex(d))
         );
     }
 }

components/sbm-core/src/test/java/org/springframework/sbm/build/api/ApplicationModuleTest.java

@@ -25,9 +25,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-@Disabled("TODO: Maven Reactor")
 class ApplicationModuleTest {
 
+    /**
+     * Searches for files in {@code /src/main/resources} of this module.
+     */
+    @Test
+    void searchMainResources() {
+
+    }
+
     @Test
     void testGetModuleResources() {
         String parentPom =