From bc40657c5cc9d1f88a9582344b62d162f79af915 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 5 Feb 2025 18:39:27 +0100 Subject: [PATCH] Expect to change Lombok AllArgsConstructor going forward --- .../MigrateCollectionsSingletonListTest.java | 53 ++++++++++++------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonListTest.java b/src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonListTest.java index 224a68da7..03991628c 100644 --- a/src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonListTest.java +++ b/src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonListTest.java @@ -42,15 +42,15 @@ void templateError() { java( """ import java.util.*; - + interface ConnectionListener { void onCreate(); } - + class A { public void setConnectionListeners(List listeners) { } - + public void test() { setConnectionListeners(Collections.singletonList(new ConnectionListener() { @Override @@ -62,15 +62,15 @@ public void onCreate() { """, """ import java.util.List; - + interface ConnectionListener { void onCreate(); } - + class A { public void setConnectionListeners(List listeners) { } - + public void test() { setConnectionListeners(List.of(new ConnectionListener() { @Override @@ -93,14 +93,14 @@ void singletonList() { java( """ import java.util.*; - + class Test { List list = Collections.singletonList("ABC"); } """, """ import java.util.List; - + class Test { List list = List.of("ABC"); } @@ -118,14 +118,14 @@ void singletonListStaticImport() { """ import java.util.*; import static java.util.Collections.singletonList; - + class Test { List list = singletonList("ABC"); } """, """ import java.util.List; - + class Test { List list = List.of("ABC"); } @@ -143,7 +143,7 @@ void singletonListCustomType() { """ import java.util.*; import java.time.LocalDate; - + class Test { List list = Collections.singletonList(LocalDate.now()); } @@ -151,7 +151,7 @@ class Test { """ import java.util.List; import java.time.LocalDate; - + class Test { List list = List.of(LocalDate.now()); } @@ -164,27 +164,40 @@ class Test { @Test void lombokAllArgsConstructor() { rewriteRun( - spec -> spec.parser(JavaParser.fromJavaVersion().classpath("lombok")) - .typeValidationOptions(TypeValidation.builder().constructorInvocations(false).build()), + spec -> spec.parser(JavaParser.fromJavaVersion().classpath("lombok")), //language=java java( """ import lombok.AllArgsConstructor; import java.util.List; - + import static java.util.Collections.singletonList; - + enum FooEnum { FOO, BAR; - + @AllArgsConstructor public enum BarEnum { foobar(singletonList(FOO)); - + private final List expectedStates; } } - """ + """, + """ + import lombok.AllArgsConstructor; + import java.util.List; + + enum FooEnum { + FOO, BAR; + + @AllArgsConstructor + public enum BarEnum { + foobar(List.of(FOO)); + + private final List expectedStates; + } + }""" ) ); } @@ -197,7 +210,7 @@ void shouldNotConvertLiteralNull() { java( """ import java.util.*; - + class Test { List list = Collections.singletonList(null); }