From 572ccfb9f64a8df37cdb537240a8e5ff6619e8b2 Mon Sep 17 00:00:00 2001 From: timo <1398557+timo-a@users.noreply.github.com> Date: Sun, 15 Dec 2024 20:42:21 +0100 Subject: [PATCH 1/3] add recipes as-is --- .../java/migrate/lombok/SummarizeGetter.java | 128 ++++++ .../java/migrate/lombok/SummarizeSetter.java | 134 ++++++ .../migrate/lombok/SummarizeGetterTest.java | 283 ++++++++++++ .../migrate/lombok/SummarizeSetterTest.java | 426 ++++++++++++++++++ 4 files changed, 971 insertions(+) create mode 100644 src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java create mode 100644 src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java create mode 100644 src/test/java/org/openrewrite/java/migrate/lombok/SummarizeGetterTest.java create mode 100644 src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java new file mode 100644 index 000000000..f45104792 --- /dev/null +++ b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java @@ -0,0 +1,128 @@ +/* + * Copyright 2021 the original author or authors. + *
+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * https://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.tree.J;
+
+import static java.util.Comparator.comparing;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class SummarizeGetter extends Recipe {
+
+ @Override
+ public String getDisplayName() {
+ //language=markdown
+ return "Summarize @Getter on fields to class level annotation";
+ }
+
+ @Override
+ public String getDescription() {
+ //language=markdown
+ return "Substitutes a class level `@Getter` annotation for annotations on every field.";
+ }
+
+ @Override
+ public TreeVisitor, ExecutionContext> getVisitor() {
+ return new Summarizer();
+ }
+
+
+ @Value
+ @EqualsAndHashCode(callSuper = false)
+ private static class Summarizer extends JavaIsoVisitor
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.tree.J;
+
+import static java.util.Comparator.comparing;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class SummarizeSetter extends Recipe {
+
+ @Override
+ public String getDisplayName() {
+ //language=markdown
+ return "Summarize @Setter on fields to class level annotation";
+ }
+
+ @Override
+ public String getDescription() {
+ //language=markdown
+ return "Substitutes a class level `@Setter` annotation for annotations on every field.";
+ }
+
+ @Override
+ public TreeVisitor, ExecutionContext> getVisitor() {
+ return new Summarizer();
+ }
+
+
+ @Value
+ @EqualsAndHashCode(callSuper = false)
+ private static class Summarizer extends JavaIsoVisitor
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+// This is a test for the ConvertToNoArgsConstructor recipe, as an example of how to write a test for an imperative recipe.
+class SummarizeGetterTest implements RewriteTest {
+
+ // Note, you can define defaults for the RecipeSpec and these defaults will be used for all tests.
+ // In this case, the recipe and the parser are common. See below, on how the defaults can be overridden
+ // per test.
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipe(new SummarizeGetter())
+ .parser(JavaParser.fromJavaVersion().logCompilationWarningsAndErrors(true).classpath("lombok"));
+ }
+
+ @DocumentExample
+ @Test
+ void replaceOneFieldGetter() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+
+ class A {
+
+ @Getter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+
+ @Getter
+ class A {
+
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void replaceOneFieldGetterWhenInFront() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+
+ class A {
+
+ @Getter int foo = 9;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+
+ @Getter
+ class A {
+
+ int foo = 9;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void otherAnnotationAbove() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ @Getter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ @Getter
+ class A {
+
+ @Setter
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void otherAnnotationBelow() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ class A {
+
+ @Getter
+ @Setter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ @Getter
+ class A {
+
+ @Setter
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void otherAnnotationsAround() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+ import lombok.Singular;
+
+ class A {
+
+ @Singular
+ @Getter
+ @Setter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+ import lombok.Singular;
+
+ @Getter
+ class A {
+
+ @Singular
+ @Setter
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void doNothingWhenNotEveryFieldIsAnnotated() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+
+ class A {
+
+ @Getter
+ int foo;
+
+ int bar;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void doNothingWhenAFieldHasSpecialConfig() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Getter;
+
+ class A {
+
+ @Getter
+ int foo;
+
+ @Getter(AccessLevel.PACKAGE)
+ int bar;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void manyFields() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Getter;
+
+ class A {
+
+ @Getter
+ int foo;
+
+ @Getter
+ int bar;
+
+ @Getter
+ int foobar;
+
+ @Getter
+ int barfoo;
+
+ }
+ """,
+ """
+ import lombok.AccessLevel;
+ import lombok.Getter;
+
+ @Getter
+ class A {
+
+ int foo;
+
+ int bar;
+
+ int foobar;
+
+ int barfoo;
+
+ }
+ """
+ )
+ );
+ }
+
+
+
+}
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java
new file mode 100644
index 000000000..882444b1b
--- /dev/null
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java
@@ -0,0 +1,426 @@
+/*
+ * Copyright 2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+// This is a test for the ConvertToNoArgsConstructor recipe, as an example of how to write a test for an imperative recipe.
+class SummarizeSetterTest implements RewriteTest {
+
+ // Note, you can define defaults for the RecipeSpec and these defaults will be used for all tests.
+ // In this case, the recipe and the parser are common. See below, on how the defaults can be overridden
+ // per test.
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipe(new SummarizeSetter())
+ .parser(JavaParser.fromJavaVersion().logCompilationWarningsAndErrors(true).classpath("lombok"));
+ }
+
+ @DocumentExample
+ @Test
+ void replaceOneFieldGetter() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void replaceOneFieldGetterWhenInFront() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Setter;
+
+ class A {
+
+ @Setter int foo = 9;
+
+ }
+ """,
+ """
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ int foo = 9;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void otherAnnotationAbove() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ class A {
+
+ @Getter
+ @Setter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ @Getter
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void otherAnnotationBelow() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ @Getter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ @Getter
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void otherAnnotationsAround() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+ import lombok.Singular;
+
+ class A {
+
+ @Singular
+ @Setter
+ @Getter
+ int foo;
+
+ }
+ """,
+ """
+ import lombok.Getter;
+ import lombok.Setter;
+ import lombok.Singular;
+
+ @Setter
+ class A {
+
+ @Singular
+ @Getter
+ int foo;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void doNothingWhenNotEveryFieldIsAnnotated() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ int bar;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void doNothingWhenAFieldHasSpecialConfig() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ @Setter(AccessLevel.PACKAGE)
+ int bar;
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void manyFields() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ @Setter
+ int bar;
+
+ @Setter
+ int foobar;
+
+ @Setter
+ int barfoo;
+
+ }
+ """,
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ int foo;
+
+ int bar;
+
+ int foobar;
+
+ int barfoo;
+
+ }
+ """
+ )
+ );
+ }
+
+ /**
+ * The occurrence of final fields does not stand in the way of a class level @Setter.
+ * Lombok won't create Setters for them, but it does compile.
+ */
+ @Test
+ void finalField() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ final int bar;
+
+ @Setter
+ final int foobar;
+
+ @Setter
+ int barfoo;
+
+ }
+ """,
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ int foo;
+
+ final int bar;
+
+ final int foobar;
+
+ int barfoo;
+
+ }
+ """
+ )
+ );
+ }
+
+ /**
+ * The occurrence of static fields does not stand in the way of a class level @Setter.
+ * Lombok won't create Setters for them, but it does compile.
+ */
+ @Test
+ void staticField() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ static int bar;
+
+ @Setter
+ static int foobar;
+
+ @Setter
+ int barfoo;
+
+ }
+ """,
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ int foo;
+
+ static int bar;
+
+ static int foobar;
+
+ int barfoo;
+
+ }
+ """
+ )
+ );
+ }
+
+ /**
+ * The occurrence of final static fields does not stand in the way of a class level @Setter.
+ * Lombok won't create Setters for them, but it does compile.
+ */
+ @Test
+ void staticFinalField() {
+ rewriteRun(// language=java
+ java(
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ class A {
+
+ @Setter
+ int foo;
+
+ static final int bar;
+
+ @Setter
+ static final int foobar;
+
+ @Setter
+ int barfoo;
+
+ }
+ """,
+ """
+ import lombok.AccessLevel;
+ import lombok.Setter;
+
+ @Setter
+ class A {
+
+ int foo;
+
+ static final int bar;
+
+ static final int foobar;
+
+ int barfoo;
+
+ }
+ """
+ )
+ );
+ }
+
+
+}
From 744065b2c70b403b4d3b869898801020292ef52f Mon Sep 17 00:00:00 2001
From: timo <1398557+timo-a@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:04:29 +0100
Subject: [PATCH 2/3] minor polish
---
.../java/migrate/lombok/SummarizeGetter.java | 8 ++++----
.../java/migrate/lombok/SummarizeSetter.java | 8 ++++----
.../java/migrate/lombok/SummarizeGetterTest.java | 10 ++--------
.../java/migrate/lombok/SummarizeSetterTest.java | 10 ++--------
4 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java
index f45104792..5f8d821c6 100644
--- a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java
+++ b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ public class SummarizeGetter extends Recipe {
@Override
public String getDisplayName() {
- //language=markdown
return "Summarize @Getter on fields to class level annotation";
}
@@ -100,6 +99,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations v
}
private J.VariableDeclarations fixFormat(J.VariableDeclarations initial, J.VariableDeclarations visited, ExecutionContext ctx) {
+ //as of August 2024 manual fixes to the format are necessary. Hopefully in the future this method becomes obsolete
boolean isAnnotationOnLineAbove = initial.toString().contains("@Getter\n");
@@ -121,8 +121,8 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
&& annotation.getArguments() == null //no Access level, or other arguments
//should only trigger on field annotation, not class annotation
&& getCursor().getParent().getValue() instanceof J.VariableDeclarations
- ? null
- : annotation;
+ ? null // -> delete
+ : annotation; // -> keep
}
}
}
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java
index 31e27a0ed..a8b333995 100644
--- a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java
+++ b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ public class SummarizeSetter extends Recipe {
@Override
public String getDisplayName() {
- //language=markdown
return "Summarize @Setter on fields to class level annotation";
}
@@ -104,6 +103,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations v
}
private J.VariableDeclarations fixFormat(J.VariableDeclarations initial, J.VariableDeclarations visited, ExecutionContext ctx) {
+ //as of August 2024 manual fixes to the format are necessary. Hopefully in the future this method becomes obsolete
boolean isAnnotationOnLineAbove = initial.toString().contains("@Setter\n");
@@ -127,8 +127,8 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
return isSetterAnnotated
//should only trigger on field annotation, not class annotation
&& getCursor().getParent().getValue() instanceof J.VariableDeclarations
- ? null
- : annotation;
+ ? null // -> delete
+ : annotation; // -> keep
}
}
}
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeGetterTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeGetterTest.java
index 336faac70..59a88e66b 100644
--- a/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeGetterTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeGetterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,22 +17,16 @@
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
-import org.openrewrite.java.JavaParser;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
import static org.openrewrite.java.Assertions.java;
-// This is a test for the ConvertToNoArgsConstructor recipe, as an example of how to write a test for an imperative recipe.
class SummarizeGetterTest implements RewriteTest {
- // Note, you can define defaults for the RecipeSpec and these defaults will be used for all tests.
- // In this case, the recipe and the parser are common. See below, on how the defaults can be overridden
- // per test.
@Override
public void defaults(RecipeSpec spec) {
- spec.recipe(new SummarizeGetter())
- .parser(JavaParser.fromJavaVersion().logCompilationWarningsAndErrors(true).classpath("lombok"));
+ spec.recipe(new SummarizeGetter());
}
@DocumentExample
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java
index 882444b1b..cdc18dbf0 100644
--- a/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/SummarizeSetterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,22 +17,16 @@
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
-import org.openrewrite.java.JavaParser;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
import static org.openrewrite.java.Assertions.java;
-// This is a test for the ConvertToNoArgsConstructor recipe, as an example of how to write a test for an imperative recipe.
class SummarizeSetterTest implements RewriteTest {
- // Note, you can define defaults for the RecipeSpec and these defaults will be used for all tests.
- // In this case, the recipe and the parser are common. See below, on how the defaults can be overridden
- // per test.
@Override
public void defaults(RecipeSpec spec) {
- spec.recipe(new SummarizeSetter())
- .parser(JavaParser.fromJavaVersion().logCompilationWarningsAndErrors(true).classpath("lombok"));
+ spec.recipe(new SummarizeSetter());
}
@DocumentExample
From b09a4e57d85ae1a8499484bb6ac3ecf8c689a6ac Mon Sep 17 00:00:00 2001
From: timo-a <1398557+timo-a@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:36:30 +0100
Subject: [PATCH 3/3] Apply suggestions from code review
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
.../openrewrite/java/migrate/lombok/SummarizeGetter.java | 4 ++--
.../openrewrite/java/migrate/lombok/SummarizeSetter.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java
index 5f8d821c6..df9f9b20e 100644
--- a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java
+++ b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeGetter.java
@@ -103,8 +103,8 @@ private J.VariableDeclarations fixFormat(J.VariableDeclarations initial, J.Varia
boolean isAnnotationOnLineAbove = initial.toString().contains("@Getter\n");
- boolean isTopAnnotationRemoved = !initial.getLeadingAnnotations().isEmpty()
- && initial.getLeadingAnnotations()
+ boolean isTopAnnotationRemoved = !initial.getLeadingAnnotations().isEmpty() &&
+ initial.getLeadingAnnotations()
.get(0)
.getSimpleName().equals("Getter");
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java
index a8b333995..2dba3ed45 100644
--- a/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java
+++ b/src/main/java/org/openrewrite/java/migrate/lombok/SummarizeSetter.java
@@ -92,8 +92,8 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations v
boolean hasSetterAnnotation = variableDecls != visited;
if (hasSetterAnnotation) {
return fixFormat(variableDecls, visited, ctx);
- } else if (variableDecls.hasModifier(J.Modifier.Type.Final)
- || variableDecls.hasModifier(J.Modifier.Type.Static)) {
+ } else if (variableDecls.hasModifier(J.Modifier.Type.Final) ||
+ variableDecls.hasModifier(J.Modifier.Type.Static)) {
//final fields and static field don't need to have an annotation
return visited;
} else {
@@ -107,8 +107,8 @@ private J.VariableDeclarations fixFormat(J.VariableDeclarations initial, J.Varia
boolean isAnnotationOnLineAbove = initial.toString().contains("@Setter\n");
- boolean isTopAnnotationRemoved = !initial.getLeadingAnnotations().isEmpty()
- && initial.getLeadingAnnotations()
+ boolean isTopAnnotationRemoved = !initial.getLeadingAnnotations().isEmpty() &&
+ initial.getLeadingAnnotations()
.get(0)
.getSimpleName().equals("Setter");