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 82aa89673..2146efc2b 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 @@ -28,6 +28,7 @@ import java.util.stream.Stream; import org.openrewrite.ExecutionContext; import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Parser; +import org.openrewrite.Parser.Input; import org.openrewrite.Recipe; import org.openrewrite.SourceFile; import org.openrewrite.Tree; @@ -45,6 +46,7 @@ import org.openrewrite.java.tree.J.CompilationUnit; import org.openrewrite.java.tree.JavaSourceFile; import org.openrewrite.java.tree.JavaType; import org.openrewrite.marker.Range; +import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -314,7 +316,14 @@ public class ORAstUtils { ctx.putMessage(JavaParser.SKIP_SOURCE_SET_TYPE_GENERATION, true); if (parseCallback != null) { ParsingExecutionContextView parseContext = ParsingExecutionContextView.view(ctx); - parseContext.setParsingListener((input, source) -> parseCallback.accept(source)); + parseContext.setParsingListener(new ParsingEventListener() { + + @Override + public void parsed(Input input, SourceFile source) { + parseCallback.accept(source); + } + + }); ctx = parseContext; } List cus = Collections.emptyList(); diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index b6424ba38..53d682c49 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -113,11 +113,11 @@ 1.13 - 8.1.13 - 5.0.6 - 1.1.2 + 8.4.2 + 5.0.9 + 1.2.0 - 7.6 + 8.3 6.1.1 true diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/AuthorizeHttpRequestsReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/AuthorizeHttpRequestsReconciler.java index e7e89ab3a..ff492250b 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/AuthorizeHttpRequestsReconciler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/AuthorizeHttpRequestsReconciler.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MethodInvocation; import org.eclipse.jdt.core.dom.SimpleType; -import org.openrewrite.java.spring.boot2.AuthorizeHttpRequests; +import org.openrewrite.java.spring.security5.AuthorizeHttpRequests; import org.springframework.ide.vscode.boot.java.Boot2JavaProblemType; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.SpringProjectUtil;