diff --git a/src/main/java/org/openrewrite/java/migrate/table/JavaVersionMigrationPlan.java b/src/main/java/org/openrewrite/java/migrate/table/JavaVersionMigrationPlan.java index df9ca54647..8c33845109 100644 --- a/src/main/java/org/openrewrite/java/migrate/table/JavaVersionMigrationPlan.java +++ b/src/main/java/org/openrewrite/java/migrate/table/JavaVersionMigrationPlan.java @@ -15,7 +15,6 @@ */ package org.openrewrite.java.migrate.table; -import lombok.Builder; import lombok.Value; import org.openrewrite.Column; import org.openrewrite.DataTable; @@ -31,7 +30,7 @@ public JavaVersionMigrationPlan(Recipe recipe) { ); } - @Builder + @lombok.Builder @Value public static class Row { diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVarTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVarTest.java index 44ca317d1a..bd4c93226f 100755 --- a/src/test/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVarTest.java +++ b/src/test/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVarTest.java @@ -88,6 +88,47 @@ void bar() { ); } + @Test + void removeValInsideNestedLambda() { + //language=java + rewriteRun( + version( + java( + """ + import java.util.function.Function; + import lombok.val; + + class A { + private String apiMetricKey = "helloKey"; + + public Function bar(Function keySelector) { + return apiMetricKey -> { + val key = keySelector.apply(apiMetricKey); + return new String[] { "aaa", "bbb" }; + }; + } + } + """, + """ + import java.util.function.Function; + + class A { + private String apiMetricKey = "helloKey"; + + public Function bar(Function keySelector) { + return apiMetricKey -> { + final var key = keySelector.apply(apiMetricKey); + return new String[] { "aaa", "bbb" }; + }; + } + } + """ + ), + 17 + ) + ); + } + @Test void preserveStarImport() { //language=java