Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize Maven project parser. Support for factories parsing.

Browse Source
This commit is contained in:
aboyko
2022-12-05 20:41:38 -05:00
parent 213487cf44
commit da35dcad18
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java
View File

@@ -49,6 +49,7 @@ import org.openrewrite.maven.tree.MavenResolutionResult;
import org.openrewrite.maven.tree.Pom;
import org.openrewrite.maven.tree.ResolvedPom;
import org.openrewrite.properties.PropertiesParser;
import org.openrewrite.text.PlainTextParser;
import org.openrewrite.xml.XmlParser;
import org.openrewrite.xml.tree.Xml;
import org.openrewrite.xml.tree.Xml.Document;
@@ -220,6 +221,14 @@ public class MavenProjectParser {
projectDirectory,
ctx
), addProvenance(provenance)));
sourceFiles.addAll(ListUtils.map(new PlainTextParser().parseInputs(
resources.stream()
.filter(p -> p.getPath().getFileName().toString().endsWith(".factories"))
.collect(Collectors.toList()),
projectDirectory,
ctx
), addProvenance(provenance)));
}
private <S extends SourceFile> S addProjectProvenance(S s, List<Marker> projectProvenance) {
@@ -319,12 +328,14 @@ public class MavenProjectParser {
}
}
public static List<Parser.Input> getMavenPoms(Path projectDir, ExecutionContext ctx, Function<Path, Parser.Input> parserInputProvider) {
return getSources(projectDir, ctx, parserInputProvider, "pom.xml").stream()
.filter(p -> p.getPath().getFileName().toString().equals("pom.xml") &&
!p.toString().contains("/src/"))
.collect(Collectors.toList());
}
public static List<Parser.Input> getMavenPoms(Path projectDir, ExecutionContext ctx,
Function<Path, Parser.Input> parserInputProvider) {
return getSources(projectDir, ctx, parserInputProvider, "pom.xml").stream().filter(p -> {
String pathStr = p.getPath().toString();
return p.getPath().getFileName().toString().equals("pom.xml") && !pathStr.contains("/src/")
&& !pathStr.contains("/bin/") && !pathStr.contains("/target/");
}).collect(Collectors.toList());
}
private static ResolvedPom getModel(Xml.Document maven) {
MavenResolutionResult pom = getResolvedPom(maven);
@@ -356,7 +367,7 @@ public class MavenProjectParser {
return List.of();
}
return getSources(projectDir.resolve(pom.getSourcePath()).getParent().resolve(Paths.get("src", "main", "resources")),
ctx, parserInputProvider, ".properties", ".xml", ".yml", ".yaml");
ctx, parserInputProvider, ".properties", ".xml", ".yml", ".yaml", ".factories");
}
private static List<Parser.Input> getTestResources(Pom pom, Path projectDir, ExecutionContext ctx, Function<Path, Parser.Input> parserInputProvider) {