diff --git a/build.gradle.kts b/build.gradle.kts index c9dba8002e..2d8f2096f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,7 @@ group = "org.openrewrite.recipe" description = "Migrate to later Java versions. Automatically." recipeDependencies { + parserClasspath("org.projectlombok:lombok:latest.release") parserClasspath("jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.0-M4") parserClasspath("jakarta.inject:jakarta.inject-api:2.0.1") parserClasspath("jakarta.servlet:jakarta.servlet-api:6.0.0") diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/FieldAnnotator.java b/src/main/java/org/openrewrite/java/migrate/lombok/FieldAnnotator.java index 12232b8c0d..feb631d33e 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/FieldAnnotator.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/FieldAnnotator.java @@ -65,7 +65,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m return JavaTemplate.builder("@" + annotation.getSimpleName() + suffix) .imports(annotation.getName(), "lombok.AccessLevel") - .javaParser(JavaParser.fromJavaVersion().classpath("lombok")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "lombok")) .build().apply(getCursor(), multiVariable.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName))); } return multiVariable; diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/UseAllArgsConstructor.java b/src/main/java/org/openrewrite/java/migrate/lombok/UseAllArgsConstructor.java index 49d54e7dae..1815cb1f32 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/UseAllArgsConstructor.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/UseAllArgsConstructor.java @@ -94,7 +94,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex } return JavaTemplate.builder(template) .imports("lombok.*") - .javaParser(JavaParser.fromJavaVersion().classpath("lombok")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "lombok")) .build() .apply(getCursor(), classDecl.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName))); } diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/UseNoArgsConstructor.java b/src/main/java/org/openrewrite/java/migrate/lombok/UseNoArgsConstructor.java index 4243dbcf41..f436860ef5 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/UseNoArgsConstructor.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/UseNoArgsConstructor.java @@ -60,7 +60,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex maybeAddImport("lombok.NoArgsConstructor"); return JavaTemplate.builder(template) .imports("lombok.*") - .javaParser(JavaParser.fromJavaVersion().classpath("lombok")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "lombok")) .build() .apply(getCursor(), classDecl.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName))); } diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/UseRequiredArgsConstructor.java b/src/main/java/org/openrewrite/java/migrate/lombok/UseRequiredArgsConstructor.java index aa2e55b33c..bc42947784 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/UseRequiredArgsConstructor.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/UseRequiredArgsConstructor.java @@ -97,7 +97,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex } return JavaTemplate.builder(template) .imports("lombok.*") - .javaParser(JavaParser.fromJavaVersion().classpath("lombok")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "lombok")) .build() .apply(getCursor(), classDecl.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName))); } diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/log/LogVisitor.java b/src/main/java/org/openrewrite/java/migrate/lombok/log/LogVisitor.java index 17ed4e1d17..a96b18c94b 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/log/LogVisitor.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/log/LogVisitor.java @@ -51,7 +51,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex maybeAddImport(logAnnotation); return JavaTemplate .builder("@" + logAnnotation.substring(logAnnotation.lastIndexOf('.') + 1) + "\n") - .javaParser(JavaParser.fromJavaVersion().classpath("lombok")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "lombok")) .imports(logAnnotation) .build() .apply( diff --git a/src/main/resources/META-INF/rewrite/classpath.tsv.gz b/src/main/resources/META-INF/rewrite/classpath.tsv.gz index 533268d060..abb860fda3 100644 Binary files a/src/main/resources/META-INF/rewrite/classpath.tsv.gz and b/src/main/resources/META-INF/rewrite/classpath.tsv.gz differ