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

Adopt rewrite changes

Browse Source
This commit is contained in:
aboyko
2023-06-09 13:39:46 -04:00
parent e010ff9b12
commit cf04fb548c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java
View File

@@ -75,7 +75,7 @@ public class GradleIJavaProjectParser extends AbstractJavaProjectParser {
Path buildFilePath = Paths.get(jp.getProjectBuild().getBuildFile());
List<G.CompilationUnit> gradleFiles = gradleParser.parseInputs(() ->
getInputs(Stream.of(buildFilePath)).iterator(), null, ctx).collect(Collectors.toList());
getInputs(Stream.of(buildFilePath)).iterator(), null, ctx).map(G.CompilationUnit.class::cast).collect(Collectors.toList());
return ListUtils.map(
gradleFiles, (i, gb) -> gb.withMarkers(gb.getMarkers().addIfAbsent(gradleProject))
);

4
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java
View File

@@ -296,7 +296,7 @@ public class ORAstUtils {
ctx.putMessage(JavaParser.SKIP_SOURCE_SET_TYPE_GENERATION, true);
List<CompilationUnit> cus = Collections.emptyList();
synchronized(parser) {
cus = parser.parse(sourceFiles, null, ctx).collect(Collectors.toList());
cus = parser.parse(sourceFiles, null, ctx).map(CompilationUnit.class::cast).collect(Collectors.toList());
}
List<J.CompilationUnit> finalCus = new ArrayList<>(cus.size());
for (CompilationUnit cu : cus) {
@@ -321,7 +321,7 @@ public class ORAstUtils {
List<CompilationUnit> cus = Collections.emptyList();
// long start = System.currentTimeMillis();
synchronized (parser) {
cus = parser.parseInputs(inputs, null, ctx).collect(Collectors.toList());
cus = parser.parseInputs(inputs, null, ctx).map(CompilationUnit.class::cast).collect(Collectors.toList());
}
// log.info("Rewrite parser: " + (System.currentTimeMillis() - start));
List<J.CompilationUnit> finalCus = new ArrayList<>(cus.size());

2
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ProjectParser.java
View File

@@ -65,7 +65,7 @@ public abstract class ProjectParser {
javaParser.setClasspath(mainClasspath);
List<CompilationUnit> javaSources = ListUtils.map(javaParser.parseInputs(
() -> getInputs(ss.javaSources.stream()).iterator(), projectDir, ctx).collect(Collectors.toList()), addProvenance(projectProvenance));
() -> getInputs(ss.javaSources.stream()).iterator(), projectDir, ctx).map(CompilationUnit.class::cast).collect(Collectors.toList()), addProvenance(projectProvenance));
JavaSourceSet javaSourceSet = ORAstUtils.addJavaSourceSet(javaSources, ss.name(),
mainClasspath);
sources.addAll(javaSources);