From cf04fb548c7c165240ee0b7b7b3efcf6b1a27632 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 9 Jun 2023 13:39:46 -0400 Subject: [PATCH] Adopt rewrite changes --- .../commons/rewrite/gradle/GradleIJavaProjectParser.java | 2 +- .../ide/vscode/commons/rewrite/java/ORAstUtils.java | 4 ++-- .../ide/vscode/commons/rewrite/java/ProjectParser.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java index de98345a7..b8f0ea620 100644 --- a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java @@ -75,7 +75,7 @@ public class GradleIJavaProjectParser extends AbstractJavaProjectParser { Path buildFilePath = Paths.get(jp.getProjectBuild().getBuildFile()); List 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)) ); diff --git a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java index f29ca5078..06f432592 100644 --- a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java @@ -296,7 +296,7 @@ public class ORAstUtils { ctx.putMessage(JavaParser.SKIP_SOURCE_SET_TYPE_GENERATION, true); List 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 finalCus = new ArrayList<>(cus.size()); for (CompilationUnit cu : cus) { @@ -321,7 +321,7 @@ public class ORAstUtils { List 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 finalCus = new ArrayList<>(cus.size()); diff --git a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ProjectParser.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ProjectParser.java index 20da69ab8..916ee90c3 100644 --- a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ProjectParser.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ProjectParser.java @@ -65,7 +65,7 @@ public abstract class ProjectParser { javaParser.setClasspath(mainClasspath); List 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);