Fix MavenProjectParser to parse all resources

.github/workflows/mvn-build.yml

@@ -16,5 +16,6 @@ jobs:
         with:
           java-version: '11'
           distribution: 'adopt'
+          cache: 'maven'
       - name: Build with Maven
         run: mvn --update-snapshots -DtrimStackTrace=false  -Dsurefire.useFile=false -DskipITs verify

components/sbm-core/pom.xml

@@ -138,6 +138,10 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.sbm</groupId>

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

@@ -17,8 +17,12 @@
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.XSlf4j;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.ipc.http.HttpSender;
+import org.openrewrite.ipc.http.OkHttpSender;
 import org.openrewrite.maven.MavenSettings;
 import org.openrewrite.maven.cache.LocalMavenArtifactCache;
 import org.openrewrite.maven.cache.MavenArtifactCache;
@@ -27,6 +31,7 @@
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 @Slf4j
@@ -40,6 +45,13 @@ public RewriteMavenArtifactDownloader() {
                         new LocalMavenArtifactCache(Paths.get(System.getProperty("user.home"), ".rewrite", "cache", "artifacts"))
                 ),
                 null,
+                new OkHttpSender(
+                        new OkHttpClient.Builder()
+                                .retryOnConnectionFailure(true)
+                                .connectTimeout(1, TimeUnit.SECONDS)
+                                .readTimeout(2, TimeUnit.SECONDS)
+                                .build()
+                ),
                 (t) -> log.error("Error while downloading dependencies", t)
         );
 

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/MavenProjectParser.java

@@ -147,14 +147,20 @@ public List<SourceFile> parse(Path projectDirectory, List<Resource> resources) {
                     Path.of("src/main/mule")
             );
 
-            // FIXME: mainSourceSetMarker and provenance marker needs to be a dde to all resources
+            // FIXME: mainSourceSetMarker and provenance marker must be added to all resources
+            List<Resource> resourceList = resourceParser.filter(projectDirectory, mainResourcePaths, resources, relativeModuleDir);
 
-            List<SourceFile> mainResources = resourceParser.parse(projectDirectory, mainResourcePaths, resources);
+            List<Marker> resourceMarker = new ArrayList(javaProvenanceMarkers);
+            resourceMarker.add(mainSourceSet);
+            resourceMarker.add(gitProvenance);
+            List<SourceFile> mainResources = resourceParser.parse(projectDirectory, resourceList, resourceMarker);
             sourceFiles.addAll(mainResources);
 
             // -------
             // Test Java sources
-            List<J.CompilationUnit> testJavaSources = parseTestJavaSources(projectDirectory, resources, ctx, javaParser, pomXml, mavenWithMarkers, mavenProjectDirectory, javaProvenanceMarkers);
+            ArrayList<Marker> markers = new ArrayList<>(javaProvenanceMarkers);
+            markers.add(mainSourceSet);
+            List<J.CompilationUnit> testJavaSources = parseTestJavaSources(projectDirectory, resources, ctx, javaParser, pomXml, mavenWithMarkers, mavenProjectDirectory, markers);
             JavaSourceSet testSourceSet = javaParser.getSourceSet(ctx);
             sourceFiles.addAll(testJavaSources);
 
@@ -166,9 +172,11 @@ public List<SourceFile> parse(Path projectDirectory, List<Resource> resources) {
                     Path.of("src/test/mule")
             );
 
-            // FIXME: mainSourceSetMarker and provenance marker needs to be a dde to all resources
-
-            List<SourceFile> testResources = resourceParser.parse(projectDirectory, testResourcePaths, resources);
+            List<Resource> filteredResources = resourceParser.filter(projectDirectory, testResourcePaths, resources, relativeModuleDir);
+            List<Marker> testResourceMarker = new ArrayList(javaProvenanceMarkers);
+            testResourceMarker.add(testSourceSet);
+            testResourceMarker.add(gitProvenance);
+            List<SourceFile> testResources = resourceParser.parse(projectDirectory, filteredResources, testResourceMarker);
             sourceFiles.addAll(testResources);
 
 //
@@ -270,8 +278,7 @@ private List<J.CompilationUnit> parseTestJavaSources(Path projectDirectory, List
         }).collect(Collectors.toList());
         List<J.CompilationUnit> testCompilationUnits = javaParser.parseInputs(testJavaSourcesInput, projectDirectory, ctx);
         // FIXME: #7 JavaParser and adding markers is required when adding java sources and should go into dedicated component
-        testCompilationUnits.stream()
-                .forEach(cu -> cu.getMarkers().getMarkers().addAll(javaProvenanceMarkers));
+        testCompilationUnits.forEach(cu -> cu.getMarkers().getMarkers().addAll(javaProvenanceMarkers));
         return testCompilationUnits;
     }
 

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/ResourceParser.java

@@ -21,11 +21,14 @@
 import org.openrewrite.SourceFile;
 import org.openrewrite.hcl.HclParser;
 import org.openrewrite.json.JsonParser;
+import org.openrewrite.marker.Marker;
+import org.openrewrite.marker.Markers;
 import org.openrewrite.properties.PropertiesParser;
 import org.openrewrite.protobuf.ProtoParser;
 import org.openrewrite.text.PlainTextParser;
 import org.openrewrite.tree.ParsingExecutionContextView;
 import org.openrewrite.xml.XmlParser;
+import org.openrewrite.xml.tree.Xml;
 import org.openrewrite.yaml.YamlParser;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.io.Resource;
@@ -52,37 +55,10 @@ public class ResourceParser {
     private final ResourceFilter resourceFilter;
     private final ApplicationEventPublisher eventPublisher;
 
-    public List<SourceFile> parse(Path baseDir, Set<Path> resourcePaths, List<Resource> resources) {
-        ParsingExecutionContextView ctx = ParsingExecutionContextView.view(new RewriteExecutionContext(eventPublisher));
-        ctx.setParsingListener((input, sourceFile) -> eventPublisher.publishEvent(new StartedScanningProjectResourceEvent(sourceFile.getSourcePath())));
-
-        List<Resource> relevantResources = resourceFilter.filter(resources, baseDir, resourcePaths);
-
-        HashMap<Parser<? extends SourceFile>, List<Parser.Input>> parserAndParserInputMappings = new LinkedHashMap();
-        parserAndParserInputMappings.put(jsonParser, new ArrayList<>());
-        parserAndParserInputMappings.put(xmlParser, new ArrayList<>());
-        parserAndParserInputMappings.put(yamlParser, new ArrayList<>());
-        parserAndParserInputMappings.put(propertiesParser, new ArrayList<>());
-        parserAndParserInputMappings.put(new ProtoParser(), new ArrayList<>());
-        parserAndParserInputMappings.put(HclParser.builder().build(), new ArrayList<>());
-        parserAndParserInputMappings.put(plainTextParser, new ArrayList<>());
-
-        List<Parser.Input> parserInputs = createParserInputs(relevantResources);
-
-        parserInputs.forEach(r -> {
-            Parser parser = parserAndParserInputMappings.keySet().stream()
-                    .filter(p -> p.accept(r))
-                    .findFirst()
-                    .orElseThrow(() -> new RuntimeException("Could not find matching parser for " + r.getPath()));
-
-            parserAndParserInputMappings.get(parser).add(r);
-        });
-
-        return parserAndParserInputMappings.entrySet().stream()
-                .map(e -> e.getKey().parseInputs(e.getValue(), baseDir, ctx))
-                .flatMap(List::stream)
-                .collect(Collectors.toList());
-
+    List<Resource> filter(Path projectDirectory, Set<Path> resourcePaths, List<Resource> resources, Path relativeModuleDir) {
+        Path comparingPath = relativeModuleDir != null ? projectDirectory.resolve(relativeModuleDir) : projectDirectory;
+        List<Resource> relevantResources = resourceFilter.filter(resources, comparingPath, resourcePaths);
+        return relevantResources;
     }
 
     private List<Parser.Input> createParserInputs(List<Resource> relevantResources) {
@@ -114,6 +90,42 @@ private InputStream getInputStream(Resource r) {
         }
     }
 
+    public List<SourceFile> parse(Path baseDir, List<Resource> relevantResources, List<Marker> markers) {
+        List<Parser.Input> parserInputs = createParserInputs(relevantResources);
+
+        HashMap<Parser<? extends SourceFile>, List<Parser.Input>> parserAndParserInputMappings = new LinkedHashMap();
+        parserAndParserInputMappings.put(jsonParser, new ArrayList<>());
+        parserAndParserInputMappings.put(xmlParser, new ArrayList<>());
+        parserAndParserInputMappings.put(yamlParser, new ArrayList<>());
+        parserAndParserInputMappings.put(propertiesParser, new ArrayList<>());
+        parserAndParserInputMappings.put(new ProtoParser(), new ArrayList<>());
+        parserAndParserInputMappings.put(HclParser.builder().build(), new ArrayList<>());
+        parserAndParserInputMappings.put(plainTextParser, new ArrayList<>());
+
+        parserInputs.forEach(r -> {
+            Parser parser = parserAndParserInputMappings.keySet().stream()
+                    .filter(p -> p.accept(r))
+                    .findFirst()
+                    .orElseThrow(() -> new RuntimeException("Could not find matching parser for " + r.getPath()));
+
+            parserAndParserInputMappings.get(parser).add(r);
+        });
+
+        ParsingExecutionContextView ctx = ParsingExecutionContextView.view(new RewriteExecutionContext(eventPublisher));
+        ctx.setParsingListener((input, sourceFile) -> eventPublisher.publishEvent(new StartedScanningProjectResourceEvent(sourceFile.getSourcePath())));
+
+        return parserAndParserInputMappings.entrySet().stream()
+                .map(e -> e.getKey().parseInputs(e.getValue(), baseDir, ctx))
+                .flatMap(List::stream)
+                .map(e -> addMarkers(e, markers))
+                .collect(Collectors.toList());
+
+    }
+
+    private SourceFile addMarkers(SourceFile e, List<Marker> markers) {
+        return e.withMarkers(Markers.build(markers));
+    }
+
     @Component
     public static class ResourceFilter {
         private List<Resource> filter(List<Resource> resources, Path moduleDir, Set<Path> searchDirs) {

components/sbm-core/src/test/java/org/springframework/sbm/java/impl/OpenRewriteMethodTest.java

@@ -144,19 +144,19 @@ void testRemoveAnnotation() {
     void removeMethodAnnotationsFromDependency() {
         String given =
                 "import javax.ejb.*;\n" +
-                        "@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
-                        "public class TransactionalService {\n" +
-                        "    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
-                        "    public void notSupported() {}\n" +
-                        "}";
+                "@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
+                "public class TransactionalService {\n" +
+                "    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
+                "    public void notSupported() {}\n" +
+                "}";
 
         String expected =
                 "import javax.ejb.*;\n" +
-                        "@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
-                        "public class TransactionalService {\n" +
-                        "    \n" +
-                        "    public void notSupported() {}\n" +
-                        "}";
+                "@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
+                "public class TransactionalService {\n" +
+                "    \n" +
+                "    public void notSupported() {}\n" +
+                "}";
 
         JavaSource javaSource = TestProjectContext.buildProjectContext()
                 .withBuildFileHavingDependencies("javax.ejb:javax.ejb-api:3.2", "org.springframework.data:spring-data-jpa:2.6.1")