diff options
Diffstat (limited to 'test/transform')
79 files changed, 693 insertions, 691 deletions
diff --git a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java index 8c0505e7..97524b9d 100644 --- a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java +++ b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java @@ -1,4 +1,4 @@ -class SetterAndWitherJavadoc { +class SetterAndWithMethodJavadoc { /** * Some value. */ @@ -7,7 +7,7 @@ class SetterAndWitherJavadoc { * Some other value. */ int j; - SetterAndWitherJavadoc(int i, int j) { + SetterAndWithMethodJavadoc(int i, int j) { this.i = i; this.j = j; } @@ -24,8 +24,8 @@ class SetterAndWitherJavadoc { * @param the new value */ @java.lang.SuppressWarnings("all") - public SetterAndWitherJavadoc withI(final int i) { - return this.i == i ? this : new SetterAndWitherJavadoc(i, this.j); + public SetterAndWithMethodJavadoc withI(final int i) { + return this.i == i ? this : new SetterAndWithMethodJavadoc(i, this.j); } /** * Set some other value. @@ -40,7 +40,7 @@ class SetterAndWitherJavadoc { * @param the other new other value */ @java.lang.SuppressWarnings("all") - public SetterAndWitherJavadoc withJ(final int j) { - return this.j == j ? this : new SetterAndWitherJavadoc(this.i, j); + public SetterAndWithMethodJavadoc withJ(final int j) { + return this.j == j ? this : new SetterAndWithMethodJavadoc(this.i, j); } } diff --git a/test/transform/resource/after-delombok/WithAlreadyExists.java b/test/transform/resource/after-delombok/WithAlreadyExists.java new file mode 100644 index 00000000..a9cb975d --- /dev/null +++ b/test/transform/resource/after-delombok/WithAlreadyExists.java @@ -0,0 +1,71 @@ +class With1 { + boolean foo; + void withFoo(boolean foo) { + } + With1(boolean foo) { + } +} +class With2 { + boolean foo; + void withFoo(String foo) { + } + With2(boolean foo) { + } +} +class With3 { + String foo; + void withFoo(boolean foo) { + } + With3(String foo) { + } +} +class With4 { + String foo; + void withFoo(String foo) { + } + With4(String foo) { + } +} +class With5 { + String foo; + void withFoo() { + } + With5(String foo) { + } + @java.lang.SuppressWarnings("all") + public With5 withFoo(final String foo) { + return this.foo == foo ? this : new With5(foo); + } +} +class With6 { + String foo; + void withFoo(String foo, int x) { + } + With6(String foo) { + } + @java.lang.SuppressWarnings("all") + public With6 withFoo(final String foo) { + return this.foo == foo ? this : new With6(foo); + } +} +class With7 { + String foo; + void withFoo(String foo, Object... x) { + } + With7(String foo) { + } +} +class With8 { + boolean isFoo; + void withIsFoo(boolean foo) { + } + With8(boolean foo) { + } +} +class With9 { + boolean isFoo; + void withFoo(boolean foo) { + } + With9(boolean foo) { + } +} diff --git a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java new file mode 100644 index 00000000..131e792c --- /dev/null +++ b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java @@ -0,0 +1,22 @@ +class WithAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { + J test; + java.util.List<L> test2; + final int x = 10; + int y = 20; + final int z; + @java.lang.SuppressWarnings("all") + public WithAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { + this.test = test; + this.test2 = test2; + this.y = y; + this.z = z; + } + @java.lang.SuppressWarnings("all") + public WithAndAllArgsConstructor<T, J, L> withTest(final J test) { + return this.test == test ? this : new WithAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z); + } + @java.lang.SuppressWarnings("all") + public WithAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { + return this.test2 == test2 ? this : new WithAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z); + } +} diff --git a/test/transform/resource/after-delombok/WithMethodAbstract.java b/test/transform/resource/after-delombok/WithMethodAbstract.java new file mode 100644 index 00000000..16f6f060 --- /dev/null +++ b/test/transform/resource/after-delombok/WithMethodAbstract.java @@ -0,0 +1,5 @@ +abstract class WithMethodAbstract { + String foo; + @java.lang.SuppressWarnings("all") + public abstract WithMethodAbstract withFoo(final String foo); +} diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java new file mode 100644 index 00000000..03b96d33 --- /dev/null +++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java @@ -0,0 +1,23 @@ +class WithMethodMarkedDeprecated { + @Deprecated + int annotation; + /** + * @deprecated + */ + int javadoc; + WithMethodMarkedDeprecated(int annotation, int javadoc) { + } + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") + public WithMethodMarkedDeprecated withAnnotation(final int annotation) { + return this.annotation == annotation ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc); + } + /** + * @deprecated + */ + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") + public WithMethodMarkedDeprecated withJavadoc(final int javadoc) { + return this.javadoc == javadoc ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc); + } +} diff --git a/test/transform/resource/after-delombok/WithOnClass.java b/test/transform/resource/after-delombok/WithOnClass.java new file mode 100644 index 00000000..d6fb6fdf --- /dev/null +++ b/test/transform/resource/after-delombok/WithOnClass.java @@ -0,0 +1,54 @@ +class WithOnClass1 { + boolean isNone; + boolean isPublic; + WithOnClass1(boolean isNone, boolean isPublic) { + } + @java.lang.SuppressWarnings("all") + public WithOnClass1 withPublic(final boolean isPublic) { + return this.isPublic == isPublic ? this : new WithOnClass1(this.isNone, isPublic); + } +} +class WithOnClass2 { + boolean isNone; + boolean isProtected; + boolean isPackage; + WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { + } + @java.lang.SuppressWarnings("all") + protected WithOnClass2 withProtected(final boolean isProtected) { + return this.isProtected == isProtected ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage); + } + @java.lang.SuppressWarnings("all") + WithOnClass2 withPackage(final boolean isPackage) { + return this.isPackage == isPackage ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage); + } +} +class WithOnClass3 { + String couldBeNull; + @lombok.NonNull + String nonNull; + WithOnClass3(String couldBeNull, String nonNull) { + } + @java.lang.SuppressWarnings("all") + public WithOnClass3 withCouldBeNull(final String couldBeNull) { + return this.couldBeNull == couldBeNull ? this : new WithOnClass3(couldBeNull, this.nonNull); + } + @java.lang.SuppressWarnings("all") + public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) { + if (nonNull == null) { + throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); + } + return this.nonNull == nonNull ? this : new WithOnClass3(this.couldBeNull, nonNull); + } +} +class WithOnClass4 { + final int fX = 10; + final int fY; + WithOnClass4(int y) { + this.fY = y; + } + @java.lang.SuppressWarnings("all") + public WithOnClass4 withY(final int fY) { + return this.fY == fY ? this : new WithOnClass4(fY); + } +} diff --git a/test/transform/resource/after-delombok/WitherOnStatic.java b/test/transform/resource/after-delombok/WithOnStatic.java index e481beb7..b234f0d6 100644 --- a/test/transform/resource/after-delombok/WitherOnStatic.java +++ b/test/transform/resource/after-delombok/WithOnStatic.java @@ -1,4 +1,4 @@ -class WitherOnStatic { +class WithOnStatic { static boolean foo; static int bar; } diff --git a/test/transform/resource/after-delombok/WithPlain.java b/test/transform/resource/after-delombok/WithPlain.java new file mode 100644 index 00000000..1a6ff22f --- /dev/null +++ b/test/transform/resource/after-delombok/WithPlain.java @@ -0,0 +1,16 @@ +class WithPlain { + int i; + final int foo; + WithPlain(int i, int foo) { + this.i = i; + this.foo = foo; + } + @java.lang.SuppressWarnings("all") + public WithPlain withI(final int i) { + return this.i == i ? this : new WithPlain(i, this.foo); + } + @java.lang.SuppressWarnings("all") + public WithPlain withFoo(final int foo) { + return this.foo == foo ? this : new WithPlain(this.i, foo); + } +} diff --git a/test/transform/resource/after-delombok/WithWithDollar.java b/test/transform/resource/after-delombok/WithWithDollar.java new file mode 100644 index 00000000..79abcc12 --- /dev/null +++ b/test/transform/resource/after-delombok/WithWithDollar.java @@ -0,0 +1,3 @@ +class WithWithDollar { + int $i; +} diff --git a/test/transform/resource/after-delombok/WithWithGenerics.java b/test/transform/resource/after-delombok/WithWithGenerics.java new file mode 100644 index 00000000..ac34f01a --- /dev/null +++ b/test/transform/resource/after-delombok/WithWithGenerics.java @@ -0,0 +1,20 @@ +class WithWithGenerics<T, J extends T, L extends java.lang.Number> { + J test; + java.util.List<L> test2; + java.util.List<? extends L> test3; + int $i; + public WithWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { + } + @java.lang.SuppressWarnings("all") + public WithWithGenerics<T, J, L> withTest(final J test) { + return this.test == test ? this : new WithWithGenerics<T, J, L>(test, this.test2, this.test3); + } + @java.lang.SuppressWarnings("all") + public WithWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { + return this.test2 == test2 ? this : new WithWithGenerics<T, J, L>(this.test, test2, this.test3); + } + @java.lang.SuppressWarnings("all") + public WithWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { + return this.test3 == test3 ? this : new WithWithGenerics<T, J, L>(this.test, this.test2, test3); + } +} diff --git a/test/transform/resource/after-delombok/WitherTypeAnnos.java b/test/transform/resource/after-delombok/WithWithTypeAnnos.java index b57438af..bf7559ba 100644 --- a/test/transform/resource/after-delombok/WitherTypeAnnos.java +++ b/test/transform/resource/after-delombok/WithWithTypeAnnos.java @@ -7,15 +7,15 @@ import java.util.List; @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } -class WitherTypeAnnos { +class WithWithTypeAnnos { @TA @TB final List<String> foo; - WitherTypeAnnos(@TA @TB List<String> foo) { + WithWithTypeAnnos(@TA @TB List<String> foo) { this.foo = foo; } @java.lang.SuppressWarnings("all") - public WitherTypeAnnos withFoo(@TA final List<String> foo) { - return this.foo == foo ? this : new WitherTypeAnnos(foo); + public WithWithTypeAnnos withFoo(@TA final List<String> foo) { + return this.foo == foo ? this : new WithWithTypeAnnos(foo); } } diff --git a/test/transform/resource/after-delombok/WitherAlreadyExists.java b/test/transform/resource/after-delombok/WitherAlreadyExists.java deleted file mode 100644 index d609bc7b..00000000 --- a/test/transform/resource/after-delombok/WitherAlreadyExists.java +++ /dev/null @@ -1,71 +0,0 @@ -class Wither1 { - boolean foo; - void withFoo(boolean foo) { - } - Wither1(boolean foo) { - } -} -class Wither2 { - boolean foo; - void withFoo(String foo) { - } - Wither2(boolean foo) { - } -} -class Wither3 { - String foo; - void withFoo(boolean foo) { - } - Wither3(String foo) { - } -} -class Wither4 { - String foo; - void withFoo(String foo) { - } - Wither4(String foo) { - } -} -class Wither5 { - String foo; - void withFoo() { - } - Wither5(String foo) { - } - @java.lang.SuppressWarnings("all") - public Wither5 withFoo(final String foo) { - return this.foo == foo ? this : new Wither5(foo); - } -} -class Wither6 { - String foo; - void withFoo(String foo, int x) { - } - Wither6(String foo) { - } - @java.lang.SuppressWarnings("all") - public Wither6 withFoo(final String foo) { - return this.foo == foo ? this : new Wither6(foo); - } -} -class Wither7 { - String foo; - void withFoo(String foo, Object... x) { - } - Wither7(String foo) { - } -} -class Wither8 { - boolean isFoo; - void withIsFoo(boolean foo) { - } - Wither8(boolean foo) { - } -} -class Wither9 { - boolean isFoo; - void withFoo(boolean foo) { - } - Wither9(boolean foo) { - } -} diff --git a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java deleted file mode 100644 index ff4fe3e2..00000000 --- a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java +++ /dev/null @@ -1,22 +0,0 @@ -class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { - J test; - java.util.List<L> test2; - final int x = 10; - int y = 20; - final int z; - @java.lang.SuppressWarnings("all") - public WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { - this.test = test; - this.test2 = test2; - this.y = y; - this.z = z; - } - @java.lang.SuppressWarnings("all") - public WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { - return this.test == test ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z); - } - @java.lang.SuppressWarnings("all") - public WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { - return this.test2 == test2 ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z); - } -} diff --git a/test/transform/resource/after-delombok/WitherDeprecated.java b/test/transform/resource/after-delombok/WitherDeprecated.java deleted file mode 100644 index b342a861..00000000 --- a/test/transform/resource/after-delombok/WitherDeprecated.java +++ /dev/null @@ -1,23 +0,0 @@ -class WitherDeprecated { - @Deprecated - int annotation; - /** - * @deprecated - */ - int javadoc; - WitherDeprecated(int annotation, int javadoc) { - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public WitherDeprecated withAnnotation(final int annotation) { - return this.annotation == annotation ? this : new WitherDeprecated(annotation, this.javadoc); - } - /** - * @deprecated - */ - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public WitherDeprecated withJavadoc(final int javadoc) { - return this.javadoc == javadoc ? this : new WitherDeprecated(this.annotation, javadoc); - } -} diff --git a/test/transform/resource/after-delombok/WitherOnClass.java b/test/transform/resource/after-delombok/WitherOnClass.java deleted file mode 100644 index abc93446..00000000 --- a/test/transform/resource/after-delombok/WitherOnClass.java +++ /dev/null @@ -1,54 +0,0 @@ -class WitherOnClass1 { - boolean isNone; - boolean isPublic; - WitherOnClass1(boolean isNone, boolean isPublic) { - } - @java.lang.SuppressWarnings("all") - public WitherOnClass1 withPublic(final boolean isPublic) { - return this.isPublic == isPublic ? this : new WitherOnClass1(this.isNone, isPublic); - } -} -class WitherOnClass2 { - boolean isNone; - boolean isProtected; - boolean isPackage; - WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { - } - @java.lang.SuppressWarnings("all") - protected WitherOnClass2 withProtected(final boolean isProtected) { - return this.isProtected == isProtected ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage); - } - @java.lang.SuppressWarnings("all") - WitherOnClass2 withPackage(final boolean isPackage) { - return this.isPackage == isPackage ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage); - } -} -class WitherOnClass3 { - String couldBeNull; - @lombok.NonNull - String nonNull; - WitherOnClass3(String couldBeNull, String nonNull) { - } - @java.lang.SuppressWarnings("all") - public WitherOnClass3 withCouldBeNull(final String couldBeNull) { - return this.couldBeNull == couldBeNull ? this : new WitherOnClass3(couldBeNull, this.nonNull); - } - @java.lang.SuppressWarnings("all") - public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) { - if (nonNull == null) { - throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); - } - return this.nonNull == nonNull ? this : new WitherOnClass3(this.couldBeNull, nonNull); - } -} -class WitherOnClass4 { - final int fX = 10; - final int fY; - WitherOnClass4(int y) { - this.fY = y; - } - @java.lang.SuppressWarnings("all") - public WitherOnClass4 withY(final int fY) { - return this.fY == fY ? this : new WitherOnClass4(fY); - } -} diff --git a/test/transform/resource/after-delombok/WitherPlain.java b/test/transform/resource/after-delombok/WitherPlain.java deleted file mode 100644 index a2e947bd..00000000 --- a/test/transform/resource/after-delombok/WitherPlain.java +++ /dev/null @@ -1,16 +0,0 @@ -class WitherPlain { - int i; - final int foo; - WitherPlain(int i, int foo) { - this.i = i; - this.foo = foo; - } - @java.lang.SuppressWarnings("all") - public WitherPlain withI(final int i) { - return this.i == i ? this : new WitherPlain(i, this.foo); - } - @java.lang.SuppressWarnings("all") - public WitherPlain withFoo(final int foo) { - return this.foo == foo ? this : new WitherPlain(this.i, foo); - } -} diff --git a/test/transform/resource/after-delombok/WitherWithAbstract.java b/test/transform/resource/after-delombok/WitherWithAbstract.java deleted file mode 100644 index f9178e99..00000000 --- a/test/transform/resource/after-delombok/WitherWithAbstract.java +++ /dev/null @@ -1,5 +0,0 @@ -abstract class WitherWithAbstract { - String foo; - @java.lang.SuppressWarnings("all") - public abstract WitherWithAbstract withFoo(final String foo); -} diff --git a/test/transform/resource/after-delombok/WitherWithDollar.java b/test/transform/resource/after-delombok/WitherWithDollar.java deleted file mode 100644 index 066f3fb5..00000000 --- a/test/transform/resource/after-delombok/WitherWithDollar.java +++ /dev/null @@ -1,3 +0,0 @@ -class WitherWithDollar { - int $i; -} diff --git a/test/transform/resource/after-delombok/WitherWithGenerics.java b/test/transform/resource/after-delombok/WitherWithGenerics.java deleted file mode 100644 index 98bbd04d..00000000 --- a/test/transform/resource/after-delombok/WitherWithGenerics.java +++ /dev/null @@ -1,20 +0,0 @@ -class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { - J test; - java.util.List<L> test2; - java.util.List<? extends L> test3; - int $i; - public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { - } - @java.lang.SuppressWarnings("all") - public WitherWithGenerics<T, J, L> withTest(final J test) { - return this.test == test ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3); - } - @java.lang.SuppressWarnings("all") - public WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { - return this.test2 == test2 ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3); - } - @java.lang.SuppressWarnings("all") - public WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { - return this.test3 == test3 ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3); - } -} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java index 03313c6d..25b28c4b 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java @@ -1,8 +1,8 @@ import lombok.Data; import lombok.experimental.Accessors; -import lombok.experimental.Wither; +import lombok.With; @Data @Accessors(chain = true) class CheckerFrameworkBasic { - private final @Wither int x; + private final @With int x; private final int y; private int z; public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBasic withX(final int x) { diff --git a/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java b/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java new file mode 100644 index 00000000..dd64e358 --- /dev/null +++ b/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java @@ -0,0 +1,22 @@ +import lombok.With; +class SetterAndWithMethodJavadoc { + @lombok.Setter @lombok.With int i; + @lombok.Setter @lombok.With int j; + SetterAndWithMethodJavadoc(int i, int j) { + super(); + this.i = i; + this.j = j; + } + public @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + public @java.lang.SuppressWarnings("all") SetterAndWithMethodJavadoc withI(final int i) { + return ((this.i == i) ? this : new SetterAndWithMethodJavadoc(i, this.j)); + } + public @java.lang.SuppressWarnings("all") void setJ(final int j) { + this.j = j; + } + public @java.lang.SuppressWarnings("all") SetterAndWithMethodJavadoc withJ(final int j) { + return ((this.j == j) ? this : new SetterAndWithMethodJavadoc(this.i, j)); + } +} diff --git a/test/transform/resource/after-ecj/SetterAndWitherJavadoc.java b/test/transform/resource/after-ecj/SetterAndWitherJavadoc.java deleted file mode 100644 index 623277a0..00000000 --- a/test/transform/resource/after-ecj/SetterAndWitherJavadoc.java +++ /dev/null @@ -1,22 +0,0 @@ -import lombok.experimental.Wither; -class SetterAndWitherJavadoc { - @lombok.Setter @lombok.experimental.Wither int i; - @lombok.Setter @lombok.experimental.Wither int j; - SetterAndWitherJavadoc(int i, int j) { - super(); - this.i = i; - this.j = j; - } - public @java.lang.SuppressWarnings("all") void setI(final int i) { - this.i = i; - } - public @java.lang.SuppressWarnings("all") SetterAndWitherJavadoc withI(final int i) { - return ((this.i == i) ? this : new SetterAndWitherJavadoc(i, this.j)); - } - public @java.lang.SuppressWarnings("all") void setJ(final int j) { - this.j = j; - } - public @java.lang.SuppressWarnings("all") SetterAndWitherJavadoc withJ(final int j) { - return ((this.j == j) ? this : new SetterAndWitherJavadoc(this.i, j)); - } -} diff --git a/test/transform/resource/after-ecj/WithAlreadyExists.java b/test/transform/resource/after-ecj/WithAlreadyExists.java new file mode 100644 index 00000000..a868cde5 --- /dev/null +++ b/test/transform/resource/after-ecj/WithAlreadyExists.java @@ -0,0 +1,78 @@ +class With1 { + @lombok.With boolean foo; + void withFoo(boolean foo) { + } + With1(boolean foo) { + super(); + } +} +class With2 { + @lombok.With boolean foo; + void withFoo(String foo) { + } + With2(boolean foo) { + super(); + } +} +class With3 { + @lombok.With String foo; + void withFoo(boolean foo) { + } + With3(String foo) { + super(); + } +} +class With4 { + @lombok.With String foo; + void withFoo(String foo) { + } + With4(String foo) { + super(); + } +} +class With5 { + @lombok.With String foo; + void withFoo() { + } + With5(String foo) { + super(); + } + public @java.lang.SuppressWarnings("all") With5 withFoo(final String foo) { + return ((this.foo == foo) ? this : new With5(foo)); + } +} +class With6 { + @lombok.With String foo; + void withFoo(String foo, int x) { + } + With6(String foo) { + super(); + } + public @java.lang.SuppressWarnings("all") With6 withFoo(final String foo) { + return ((this.foo == foo) ? this : new With6(foo)); + } +} +class With7 { + @lombok.With String foo; + void withFoo(String foo, Object... x) { + } + With7(String foo) { + super(); + } +} +class With8 { + @lombok.With boolean isFoo; + void withIsFoo(boolean foo) { + } + With8(boolean foo) { + super(); + } +} +class With9 { + @lombok.With boolean isFoo; + void withFoo(boolean foo) { + } + With9(boolean foo) { + super(); + } +} diff --git a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java new file mode 100644 index 00000000..d3fcded2 --- /dev/null +++ b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java @@ -0,0 +1,20 @@ +@lombok.AllArgsConstructor class WithAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { + @lombok.With J test; + @lombok.With java.util.List<L> test2; + final int x = 10; + int y = 20; + final int z; + public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor<T, J, L> withTest(final J test) { + return ((this.test == test) ? this : new WithAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z)); + } + public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { + return ((this.test2 == test2) ? this : new WithAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z)); + } + public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { + super(); + this.test = test; + this.test2 = test2; + this.y = y; + this.z = z; + } +} diff --git a/test/transform/resource/after-ecj/WithMethodAbstract.java b/test/transform/resource/after-ecj/WithMethodAbstract.java new file mode 100644 index 00000000..cb71357a --- /dev/null +++ b/test/transform/resource/after-ecj/WithMethodAbstract.java @@ -0,0 +1,7 @@ +abstract class WithMethodAbstract { + @lombok.With String foo; + WithMethodAbstract() { + super(); + } + public abstract @java.lang.SuppressWarnings("all") WithMethodAbstract withFoo(final String foo); +} diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java new file mode 100644 index 00000000..cd123fe8 --- /dev/null +++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java @@ -0,0 +1,14 @@ +import lombok.With; +class WithMethodMarkedDeprecated { + @Deprecated @With int annotation; + @With int javadoc; + WithMethodMarkedDeprecated(int annotation, int javadoc) { + super(); + } + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withAnnotation(final int annotation) { + return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc)); + } + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withJavadoc(final int javadoc) { + return ((this.javadoc == javadoc) ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc)); + } +} diff --git a/test/transform/resource/after-ecj/WithOnClass.java b/test/transform/resource/after-ecj/WithOnClass.java new file mode 100644 index 00000000..ca3e8c6b --- /dev/null +++ b/test/transform/resource/after-ecj/WithOnClass.java @@ -0,0 +1,52 @@ +@lombok.With class WithOnClass1 { + @lombok.With(lombok.AccessLevel.NONE) boolean isNone; + boolean isPublic; + WithOnClass1(boolean isNone, boolean isPublic) { + super(); + } + public @java.lang.SuppressWarnings("all") WithOnClass1 withPublic(final boolean isPublic) { + return ((this.isPublic == isPublic) ? this : new WithOnClass1(this.isNone, isPublic)); + } +} +@lombok.With(lombok.AccessLevel.PROTECTED) class WithOnClass2 { + @lombok.With(lombok.AccessLevel.NONE) boolean isNone; + boolean isProtected; + @lombok.With(lombok.AccessLevel.PACKAGE) boolean isPackage; + WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { + super(); + } + @java.lang.SuppressWarnings("all") WithOnClass2 withPackage(final boolean isPackage) { + return ((this.isPackage == isPackage) ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage)); + } + protected @java.lang.SuppressWarnings("all") WithOnClass2 withProtected(final boolean isProtected) { + return ((this.isProtected == isProtected) ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage)); + } +} +@lombok.With class WithOnClass3 { + String couldBeNull; + @lombok.NonNull String nonNull; + WithOnClass3(String couldBeNull, String nonNull) { + super(); + } + public @java.lang.SuppressWarnings("all") WithOnClass3 withCouldBeNull(final String couldBeNull) { + return ((this.couldBeNull == couldBeNull) ? this : new WithOnClass3(couldBeNull, this.nonNull)); + } + public @java.lang.SuppressWarnings("all") WithOnClass3 withNonNull(final @lombok.NonNull String nonNull) { + if ((nonNull == null)) + { + throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); + } + return ((this.nonNull == nonNull) ? this : new WithOnClass3(this.couldBeNull, nonNull)); + } +} +@lombok.With @lombok.experimental.Accessors(prefix = "f") class WithOnClass4 { + final int fX = 10; + final int fY; + WithOnClass4(int y) { + super(); + this.fY = y; + } + public @java.lang.SuppressWarnings("all") WithOnClass4 withY(final int fY) { + return ((this.fY == fY) ? this : new WithOnClass4(fY)); + } +} diff --git a/test/transform/resource/after-ecj/WithOnStatic.java b/test/transform/resource/after-ecj/WithOnStatic.java new file mode 100644 index 00000000..7094ae5e --- /dev/null +++ b/test/transform/resource/after-ecj/WithOnStatic.java @@ -0,0 +1,9 @@ +class WithOnStatic { + static @lombok.With boolean foo; + static @lombok.With int bar; + <clinit>() { + } + WithOnStatic() { + super(); + } +} diff --git a/test/transform/resource/after-ecj/WithPlain.java b/test/transform/resource/after-ecj/WithPlain.java new file mode 100644 index 00000000..4203f540 --- /dev/null +++ b/test/transform/resource/after-ecj/WithPlain.java @@ -0,0 +1,16 @@ +import lombok.With; +class WithPlain { + @lombok.With int i; + final @With int foo; + WithPlain(int i, int foo) { + super(); + this.i = i; + this.foo = foo; + } + public @java.lang.SuppressWarnings("all") WithPlain withI(final int i) { + return ((this.i == i) ? this : new WithPlain(i, this.foo)); + } + public @java.lang.SuppressWarnings("all") WithPlain withFoo(final int foo) { + return ((this.foo == foo) ? this : new WithPlain(this.i, foo)); + } +} diff --git a/test/transform/resource/after-ecj/WithWithDollar.java b/test/transform/resource/after-ecj/WithWithDollar.java new file mode 100644 index 00000000..1fa830d4 --- /dev/null +++ b/test/transform/resource/after-ecj/WithWithDollar.java @@ -0,0 +1,6 @@ +class WithWithDollar { + @lombok.With int $i; + WithWithDollar() { + super(); + } +} diff --git a/test/transform/resource/after-ecj/WithWithGenerics.java b/test/transform/resource/after-ecj/WithWithGenerics.java new file mode 100644 index 00000000..b6985b99 --- /dev/null +++ b/test/transform/resource/after-ecj/WithWithGenerics.java @@ -0,0 +1,18 @@ +class WithWithGenerics<T, J extends T, L extends java.lang.Number> { + @lombok.With J test; + @lombok.With java.util.List<L> test2; + @lombok.With java.util.List<? extends L> test3; + int $i; + public WithWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { + super(); + } + public @java.lang.SuppressWarnings("all") WithWithGenerics<T, J, L> withTest(final J test) { + return ((this.test == test) ? this : new WithWithGenerics<T, J, L>(test, this.test2, this.test3)); + } + public @java.lang.SuppressWarnings("all") WithWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { + return ((this.test2 == test2) ? this : new WithWithGenerics<T, J, L>(this.test, test2, this.test3)); + } + public @java.lang.SuppressWarnings("all") WithWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { + return ((this.test3 == test3) ? this : new WithWithGenerics<T, J, L>(this.test, this.test2, test3)); + } +} diff --git a/test/transform/resource/after-ecj/WitherTypeAnnos.java b/test/transform/resource/after-ecj/WithWithTypeAnnos.java index e41d9e13..ff73869b 100644 --- a/test/transform/resource/after-ecj/WitherTypeAnnos.java +++ b/test/transform/resource/after-ecj/WithWithTypeAnnos.java @@ -1,4 +1,4 @@ -import lombok.experimental.Wither; +import lombok.With; import java.lang.annotation.ElementType; import java.lang.annotation.Target; import java.util.List; @@ -6,13 +6,13 @@ import java.util.List; } @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } -class WitherTypeAnnos { - final @Wither @TA @TB List<String> foo; - WitherTypeAnnos(@TA @TB List<String> foo) { +class WithWithTypeAnnos { + final @With @TA @TB List<String> foo; + WithWithTypeAnnos(@TA @TB List<String> foo) { super(); this.foo = foo; } - public @java.lang.SuppressWarnings("all") WitherTypeAnnos withFoo(final @TA List<String> foo) { - return ((this.foo == foo) ? this : new WitherTypeAnnos(foo)); + public @java.lang.SuppressWarnings("all") WithWithTypeAnnos withFoo(final @TA List<String> foo) { + return ((this.foo == foo) ? this : new WithWithTypeAnnos(foo)); } } diff --git a/test/transform/resource/after-ecj/WitherAlreadyExists.java b/test/transform/resource/after-ecj/WitherAlreadyExists.java deleted file mode 100644 index ded10755..00000000 --- a/test/transform/resource/after-ecj/WitherAlreadyExists.java +++ /dev/null @@ -1,78 +0,0 @@ -class Wither1 { - @lombok.experimental.Wither boolean foo; - void withFoo(boolean foo) { - } - Wither1(boolean foo) { - super(); - } -} -class Wither2 { - @lombok.experimental.Wither boolean foo; - void withFoo(String foo) { - } - Wither2(boolean foo) { - super(); - } -} -class Wither3 { - @lombok.experimental.Wither String foo; - void withFoo(boolean foo) { - } - Wither3(String foo) { - super(); - } -} -class Wither4 { - @lombok.experimental.Wither String foo; - void withFoo(String foo) { - } - Wither4(String foo) { - super(); - } -} -class Wither5 { - @lombok.experimental.Wither String foo; - void withFoo() { - } - Wither5(String foo) { - super(); - } - public @java.lang.SuppressWarnings("all") Wither5 withFoo(final String foo) { - return ((this.foo == foo) ? this : new Wither5(foo)); - } -} -class Wither6 { - @lombok.experimental.Wither String foo; - void withFoo(String foo, int x) { - } - Wither6(String foo) { - super(); - } - public @java.lang.SuppressWarnings("all") Wither6 withFoo(final String foo) { - return ((this.foo == foo) ? this : new Wither6(foo)); - } -} -class Wither7 { - @lombok.experimental.Wither String foo; - void withFoo(String foo, Object... x) { - } - Wither7(String foo) { - super(); - } -} -class Wither8 { - @lombok.experimental.Wither boolean isFoo; - void withIsFoo(boolean foo) { - } - Wither8(boolean foo) { - super(); - } -} -class Wither9 { - @lombok.experimental.Wither boolean isFoo; - void withFoo(boolean foo) { - } - Wither9(boolean foo) { - super(); - } -} diff --git a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java deleted file mode 100644 index 10e993e1..00000000 --- a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java +++ /dev/null @@ -1,20 +0,0 @@ -@lombok.AllArgsConstructor class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { - @lombok.experimental.Wither J test; - @lombok.experimental.Wither java.util.List<L> test2; - final int x = 10; - int y = 20; - final int z; - public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { - return ((this.test == test) ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z)); - } - public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { - return ((this.test2 == test2) ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z)); - } - public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { - super(); - this.test = test; - this.test2 = test2; - this.y = y; - this.z = z; - } -} diff --git a/test/transform/resource/after-ecj/WitherDeprecated.java b/test/transform/resource/after-ecj/WitherDeprecated.java deleted file mode 100644 index b57d0d79..00000000 --- a/test/transform/resource/after-ecj/WitherDeprecated.java +++ /dev/null @@ -1,14 +0,0 @@ -import lombok.experimental.Wither; -class WitherDeprecated { - @Deprecated @Wither int annotation; - @Wither int javadoc; - WitherDeprecated(int annotation, int javadoc) { - super(); - } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WitherDeprecated withAnnotation(final int annotation) { - return ((this.annotation == annotation) ? this : new WitherDeprecated(annotation, this.javadoc)); - } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WitherDeprecated withJavadoc(final int javadoc) { - return ((this.javadoc == javadoc) ? this : new WitherDeprecated(this.annotation, javadoc)); - } -} diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java deleted file mode 100644 index 166d1842..00000000 --- a/test/transform/resource/after-ecj/WitherOnClass.java +++ /dev/null @@ -1,52 +0,0 @@ -@lombok.experimental.Wither class WitherOnClass1 { - @lombok.experimental.Wither(lombok.AccessLevel.NONE) boolean isNone; - boolean isPublic; - WitherOnClass1(boolean isNone, boolean isPublic) { - super(); - } - public @java.lang.SuppressWarnings("all") WitherOnClass1 withPublic(final boolean isPublic) { - return ((this.isPublic == isPublic) ? this : new WitherOnClass1(this.isNone, isPublic)); - } -} -@lombok.experimental.Wither(lombok.AccessLevel.PROTECTED) class WitherOnClass2 { - @lombok.experimental.Wither(lombok.AccessLevel.NONE) boolean isNone; - boolean isProtected; - @lombok.experimental.Wither(lombok.AccessLevel.PACKAGE) boolean isPackage; - WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { - super(); - } - @java.lang.SuppressWarnings("all") WitherOnClass2 withPackage(final boolean isPackage) { - return ((this.isPackage == isPackage) ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage)); - } - protected @java.lang.SuppressWarnings("all") WitherOnClass2 withProtected(final boolean isProtected) { - return ((this.isProtected == isProtected) ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage)); - } -} -@lombok.experimental.Wither class WitherOnClass3 { - String couldBeNull; - @lombok.NonNull String nonNull; - WitherOnClass3(String couldBeNull, String nonNull) { - super(); - } - public @java.lang.SuppressWarnings("all") WitherOnClass3 withCouldBeNull(final String couldBeNull) { - return ((this.couldBeNull == couldBeNull) ? this : new WitherOnClass3(couldBeNull, this.nonNull)); - } - public @java.lang.SuppressWarnings("all") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) { - if ((nonNull == null)) - { - throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); - } - return ((this.nonNull == nonNull) ? this : new WitherOnClass3(this.couldBeNull, nonNull)); - } -} -@lombok.experimental.Wither @lombok.experimental.Accessors(prefix = "f") class WitherOnClass4 { - final int fX = 10; - final int fY; - WitherOnClass4(int y) { - super(); - this.fY = y; - } - public @java.lang.SuppressWarnings("all") WitherOnClass4 withY(final int fY) { - return ((this.fY == fY) ? this : new WitherOnClass4(fY)); - } -} diff --git a/test/transform/resource/after-ecj/WitherOnStatic.java b/test/transform/resource/after-ecj/WitherOnStatic.java deleted file mode 100644 index 8f385e09..00000000 --- a/test/transform/resource/after-ecj/WitherOnStatic.java +++ /dev/null @@ -1,9 +0,0 @@ -class WitherOnStatic { - static @lombok.experimental.Wither boolean foo; - static @lombok.experimental.Wither int bar; - <clinit>() { - } - WitherOnStatic() { - super(); - } -} diff --git a/test/transform/resource/after-ecj/WitherPlain.java b/test/transform/resource/after-ecj/WitherPlain.java deleted file mode 100644 index ae1988bc..00000000 --- a/test/transform/resource/after-ecj/WitherPlain.java +++ /dev/null @@ -1,16 +0,0 @@ -import lombok.experimental.Wither; -class WitherPlain { - @lombok.experimental.Wither int i; - final @Wither int foo; - WitherPlain(int i, int foo) { - super(); - this.i = i; - this.foo = foo; - } - public @java.lang.SuppressWarnings("all") WitherPlain withI(final int i) { - return ((this.i == i) ? this : new WitherPlain(i, this.foo)); - } - public @java.lang.SuppressWarnings("all") WitherPlain withFoo(final int foo) { - return ((this.foo == foo) ? this : new WitherPlain(this.i, foo)); - } -} diff --git a/test/transform/resource/after-ecj/WitherWithAbstract.java b/test/transform/resource/after-ecj/WitherWithAbstract.java deleted file mode 100644 index ed71347e..00000000 --- a/test/transform/resource/after-ecj/WitherWithAbstract.java +++ /dev/null @@ -1,7 +0,0 @@ -abstract class WitherWithAbstract { - @lombok.experimental.Wither String foo; - WitherWithAbstract() { - super(); - } - public abstract @java.lang.SuppressWarnings("all") WitherWithAbstract withFoo(final String foo); -} diff --git a/test/transform/resource/after-ecj/WitherWithDollar.java b/test/transform/resource/after-ecj/WitherWithDollar.java deleted file mode 100644 index db46e259..00000000 --- a/test/transform/resource/after-ecj/WitherWithDollar.java +++ /dev/null @@ -1,6 +0,0 @@ -class WitherWithDollar { - @lombok.experimental.Wither int $i; - WitherWithDollar() { - super(); - } -} diff --git a/test/transform/resource/after-ecj/WitherWithGenerics.java b/test/transform/resource/after-ecj/WitherWithGenerics.java deleted file mode 100644 index ee73297c..00000000 --- a/test/transform/resource/after-ecj/WitherWithGenerics.java +++ /dev/null @@ -1,18 +0,0 @@ -class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { - @lombok.experimental.Wither J test; - @lombok.experimental.Wither java.util.List<L> test2; - @lombok.experimental.Wither java.util.List<? extends L> test3; - int $i; - public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { - super(); - } - public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest(final J test) { - return ((this.test == test) ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3)); - } - public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { - return ((this.test2 == test2) ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3)); - } - public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { - return ((this.test3 == test3) ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3)); - } -} diff --git a/test/transform/resource/before/BuilderInvalidUse.java b/test/transform/resource/before/BuilderInvalidUse.java index 1a5f2950..3945e64c 100644 --- a/test/transform/resource/before/BuilderInvalidUse.java +++ b/test/transform/resource/before/BuilderInvalidUse.java @@ -3,7 +3,7 @@ class BuilderInvalidUse { private int something; - @lombok.Getter @lombok.Setter @lombok.experimental.FieldDefaults(makeFinal = true) @lombok.experimental.Wither @lombok.Data @lombok.ToString @lombok.EqualsAndHashCode + @lombok.Getter @lombok.Setter @lombok.experimental.FieldDefaults(makeFinal = true) @lombok.With @lombok.Data @lombok.ToString @lombok.EqualsAndHashCode @lombok.AllArgsConstructor public static class BuilderInvalidUseBuilder { diff --git a/test/transform/resource/before/CheckerFrameworkBasic.java b/test/transform/resource/before/CheckerFrameworkBasic.java index 5b59165a..7dd40b54 100644 --- a/test/transform/resource/before/CheckerFrameworkBasic.java +++ b/test/transform/resource/before/CheckerFrameworkBasic.java @@ -1,11 +1,11 @@ //CONF: checkerframework = 3.0 import lombok.Data; import lombok.experimental.Accessors; -import lombok.experimental.Wither; +import lombok.With; @Data @Accessors(chain = true) class CheckerFrameworkBasic { - @Wither private final int x; + @With private final int x; private final int y; private int z; } diff --git a/test/transform/resource/before/FlagUsages.java b/test/transform/resource/before/FlagUsages.java index 6631224f..df3e8044 100644 --- a/test/transform/resource/before/FlagUsages.java +++ b/test/transform/resource/before/FlagUsages.java @@ -1,10 +1,11 @@ //skip compare content //CONF: lombok.Getter.flagUsage = WARNING //CONF: lombok.experimental.flagUsage = ERROR +@lombok.experimental.FieldNameConstants public class FlagUsages { @lombok.Getter String x; - @lombok.experimental.Wither String z; + String z; public FlagUsages(String x, String y) { } diff --git a/test/transform/resource/before/SetterAndWitherJavadoc.java b/test/transform/resource/before/SetterAndWithMethodJavadoc.java index 6953eb39..ba10b7f2 100644 --- a/test/transform/resource/before/SetterAndWitherJavadoc.java +++ b/test/transform/resource/before/SetterAndWithMethodJavadoc.java @@ -1,10 +1,10 @@ -import lombok.experimental.Wither; -class SetterAndWitherJavadoc { +import lombok.With; +class SetterAndWithMethodJavadoc { /** * Some value. * @param the new value */ - @lombok.Setter @lombok.experimental.Wither int i; + @lombok.Setter @lombok.With int i; /** * Some other value. @@ -13,13 +13,13 @@ class SetterAndWitherJavadoc { * Set some other value. * @param the new other value * - * --- WITHER --- + * --- WITH --- * Reinstantiate with some other value. * @param the other new other value */ - @lombok.Setter @lombok.experimental.Wither int j; + @lombok.Setter @lombok.With int j; - SetterAndWitherJavadoc(int i, int j) { + SetterAndWithMethodJavadoc(int i, int j) { this.i = i; this.j = j; } diff --git a/test/transform/resource/before/WithAlreadyExists.java b/test/transform/resource/before/WithAlreadyExists.java new file mode 100644 index 00000000..ac1414b6 --- /dev/null +++ b/test/transform/resource/before/WithAlreadyExists.java @@ -0,0 +1,89 @@ +class With1 { + @lombok.With boolean foo; + + void withFoo(boolean foo) { + } + + With1(boolean foo) { + } +} + +class With2 { + @lombok.With boolean foo; + + void withFoo(String foo) { + } + + With2(boolean foo) { + } +} + +class With3 { + @lombok.With String foo; + + void withFoo(boolean foo) { + } + + With3(String foo) { + } +} + +class With4 { + @lombok.With String foo; + + void withFoo(String foo) { + } + + With4(String foo) { + } +} + +class With5 { + @lombok.With String foo; + + void withFoo() { + } + + With5(String foo) { + } +} + +class With6 { + @lombok.With String foo; + + void withFoo(String foo, int x) { + } + + With6(String foo) { + } +} + +class With7 { + @lombok.With String foo; + + void withFoo(String foo, Object... x) { + } + + With7(String foo) { + } +} + +class With8 { + @lombok.With boolean isFoo; + + void withIsFoo(boolean foo) { + } + + With8(boolean foo) { + } +} + +class With9 { + @lombok.With boolean isFoo; + + void withFoo(boolean foo) { + } + + With9(boolean foo) { + } +} diff --git a/test/transform/resource/before/WithAndAllArgsConstructor.java b/test/transform/resource/before/WithAndAllArgsConstructor.java new file mode 100644 index 00000000..d11d4faa --- /dev/null +++ b/test/transform/resource/before/WithAndAllArgsConstructor.java @@ -0,0 +1,12 @@ +@lombok.AllArgsConstructor +class WithAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { + @lombok.With J test; + + @lombok.With java.util.List<L> test2; + + final int x = 10; + + int y = 20; + + final int z; +}
\ No newline at end of file diff --git a/test/transform/resource/before/WithMethodAbstract.java b/test/transform/resource/before/WithMethodAbstract.java new file mode 100644 index 00000000..fd6edbc9 --- /dev/null +++ b/test/transform/resource/before/WithMethodAbstract.java @@ -0,0 +1,3 @@ +abstract class WithMethodAbstract { + @lombok.With String foo; +}
\ No newline at end of file diff --git a/test/transform/resource/before/WithMethodMarkedDeprecated.java b/test/transform/resource/before/WithMethodMarkedDeprecated.java new file mode 100644 index 00000000..7a6549e5 --- /dev/null +++ b/test/transform/resource/before/WithMethodMarkedDeprecated.java @@ -0,0 +1,15 @@ +import lombok.With; + +class WithMethodMarkedDeprecated { + + @Deprecated + @With int annotation; + + /** + * @deprecated + */ + @With int javadoc; + + WithMethodMarkedDeprecated(int annotation, int javadoc) { + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/WithOnClass.java b/test/transform/resource/before/WithOnClass.java new file mode 100644 index 00000000..a6215b54 --- /dev/null +++ b/test/transform/resource/before/WithOnClass.java @@ -0,0 +1,45 @@ +@lombok.With +class WithOnClass1 { + @lombok.With(lombok.AccessLevel.NONE) + boolean isNone; + + boolean isPublic; + + WithOnClass1(boolean isNone, boolean isPublic) { + } +} + +@lombok.With(lombok.AccessLevel.PROTECTED) +class WithOnClass2 { + @lombok.With(lombok.AccessLevel.NONE) + boolean isNone; + + boolean isProtected; + + @lombok.With(lombok.AccessLevel.PACKAGE) + boolean isPackage; + + WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { + } +} + +@lombok.With +class WithOnClass3 { + String couldBeNull; + + @lombok.NonNull String nonNull; + + WithOnClass3(String couldBeNull, String nonNull) { + } +} + +@lombok.With @lombok.experimental.Accessors(prefix="f") +class WithOnClass4 { + final int fX = 10; + + final int fY; + + WithOnClass4(int y) { + this.fY = y; + } +} diff --git a/test/transform/resource/before/WithOnStatic.java b/test/transform/resource/before/WithOnStatic.java new file mode 100644 index 00000000..f8105e0e --- /dev/null +++ b/test/transform/resource/before/WithOnStatic.java @@ -0,0 +1,4 @@ +class WithOnStatic { + @lombok.With static boolean foo; + @lombok.With static int bar; +} diff --git a/test/transform/resource/before/WithPlain.java b/test/transform/resource/before/WithPlain.java new file mode 100644 index 00000000..1b2a19c4 --- /dev/null +++ b/test/transform/resource/before/WithPlain.java @@ -0,0 +1,10 @@ +import lombok.With; +class WithPlain { + @lombok.With int i; + @With final int foo; + + WithPlain(int i, int foo) { + this.i = i; + this.foo = foo; + } +} diff --git a/test/transform/resource/before/WithWithDollar.java b/test/transform/resource/before/WithWithDollar.java new file mode 100644 index 00000000..1dd5d47d --- /dev/null +++ b/test/transform/resource/before/WithWithDollar.java @@ -0,0 +1,3 @@ +class WithWithDollar { + @lombok.With int $i; +} diff --git a/test/transform/resource/before/WithWithGenerics.java b/test/transform/resource/before/WithWithGenerics.java new file mode 100644 index 00000000..d94405d8 --- /dev/null +++ b/test/transform/resource/before/WithWithGenerics.java @@ -0,0 +1,9 @@ +class WithWithGenerics<T, J extends T, L extends java.lang.Number> { + @lombok.With J test; + @lombok.With java.util.List<L> test2; + @lombok.With java.util.List<? extends L> test3; + int $i; + + public WithWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/WitherTypeAnnos.java b/test/transform/resource/before/WithWithTypeAnnos.java index 97cd3d9f..ceef6d61 100644 --- a/test/transform/resource/before/WitherTypeAnnos.java +++ b/test/transform/resource/before/WithWithTypeAnnos.java @@ -1,5 +1,5 @@ //CONF: lombok.copyableAnnotations += TA -import lombok.experimental.Wither; +import lombok.With; import java.lang.annotation.ElementType; import java.lang.annotation.Target; import java.util.List; @@ -9,10 +9,10 @@ import java.util.List; @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } -class WitherTypeAnnos { - @Wither final @TA @TB List<String> foo; +class WithWithTypeAnnos { + @With final @TA @TB List<String> foo; - WitherTypeAnnos(@TA @TB List<String> foo) { + WithWithTypeAnnos(@TA @TB List<String> foo) { this.foo = foo; } } diff --git a/test/transform/resource/before/WitherAlreadyExists.java b/test/transform/resource/before/WitherAlreadyExists.java deleted file mode 100644 index 7833173a..00000000 --- a/test/transform/resource/before/WitherAlreadyExists.java +++ /dev/null @@ -1,89 +0,0 @@ -class Wither1 { - @lombok.experimental.Wither boolean foo; - - void withFoo(boolean foo) { - } - - Wither1(boolean foo) { - } -} - -class Wither2 { - @lombok.experimental.Wither boolean foo; - - void withFoo(String foo) { - } - - Wither2(boolean foo) { - } -} - -class Wither3 { - @lombok.experimental.Wither String foo; - - void withFoo(boolean foo) { - } - - Wither3(String foo) { - } -} - -class Wither4 { - @lombok.experimental.Wither String foo; - - void withFoo(String foo) { - } - - Wither4(String foo) { - } -} - -class Wither5 { - @lombok.experimental.Wither String foo; - - void withFoo() { - } - - Wither5(String foo) { - } -} - -class Wither6 { - @lombok.experimental.Wither String foo; - - void withFoo(String foo, int x) { - } - - Wither6(String foo) { - } -} - -class Wither7 { - @lombok.experimental.Wither String foo; - - void withFoo(String foo, Object... x) { - } - - Wither7(String foo) { - } -} - -class Wither8 { - @lombok.experimental.Wither boolean isFoo; - - void withIsFoo(boolean foo) { - } - - Wither8(boolean foo) { - } -} - -class Wither9 { - @lombok.experimental.Wither boolean isFoo; - - void withFoo(boolean foo) { - } - - Wither9(boolean foo) { - } -} diff --git a/test/transform/resource/before/WitherAndAllArgsConstructor.java b/test/transform/resource/before/WitherAndAllArgsConstructor.java deleted file mode 100644 index d531b3f4..00000000 --- a/test/transform/resource/before/WitherAndAllArgsConstructor.java +++ /dev/null @@ -1,12 +0,0 @@ -@lombok.AllArgsConstructor -class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { - @lombok.experimental.Wither J test; - - @lombok.experimental.Wither java.util.List<L> test2; - - final int x = 10; - - int y = 20; - - final int z; -}
\ No newline at end of file diff --git a/test/transform/resource/before/WitherDeprecated.java b/test/transform/resource/before/WitherDeprecated.java deleted file mode 100644 index efd1af43..00000000 --- a/test/transform/resource/before/WitherDeprecated.java +++ /dev/null @@ -1,15 +0,0 @@ -import lombok.experimental.Wither; - -class WitherDeprecated { - - @Deprecated - @Wither int annotation; - - /** - * @deprecated - */ - @Wither int javadoc; - - WitherDeprecated(int annotation, int javadoc) { - } -}
\ No newline at end of file diff --git a/test/transform/resource/before/WitherOnClass.java b/test/transform/resource/before/WitherOnClass.java deleted file mode 100644 index d6a3d3c8..00000000 --- a/test/transform/resource/before/WitherOnClass.java +++ /dev/null @@ -1,45 +0,0 @@ -@lombok.experimental.Wither -class WitherOnClass1 { - @lombok.experimental.Wither(lombok.AccessLevel.NONE) - boolean isNone; - - boolean isPublic; - - WitherOnClass1(boolean isNone, boolean isPublic) { - } -} - -@lombok.experimental.Wither(lombok.AccessLevel.PROTECTED) -class WitherOnClass2 { - @lombok.experimental.Wither(lombok.AccessLevel.NONE) - boolean isNone; - - boolean isProtected; - - @lombok.experimental.Wither(lombok.AccessLevel.PACKAGE) - boolean isPackage; - - WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { - } -} - -@lombok.experimental.Wither -class WitherOnClass3 { - String couldBeNull; - - @lombok.NonNull String nonNull; - - WitherOnClass3(String couldBeNull, String nonNull) { - } -} - -@lombok.experimental.Wither @lombok.experimental.Accessors(prefix="f") -class WitherOnClass4 { - final int fX = 10; - - final int fY; - - WitherOnClass4(int y) { - this.fY = y; - } -} diff --git a/test/transform/resource/before/WitherOnStatic.java b/test/transform/resource/before/WitherOnStatic.java deleted file mode 100644 index 566c8154..00000000 --- a/test/transform/resource/before/WitherOnStatic.java +++ /dev/null @@ -1,4 +0,0 @@ -class WitherOnStatic { - @lombok.experimental.Wither static boolean foo; - @lombok.experimental.Wither static int bar; -} diff --git a/test/transform/resource/before/WitherPlain.java b/test/transform/resource/before/WitherPlain.java deleted file mode 100644 index 436e6f3b..00000000 --- a/test/transform/resource/before/WitherPlain.java +++ /dev/null @@ -1,10 +0,0 @@ -import lombok.experimental.Wither; -class WitherPlain { - @lombok.experimental.Wither int i; - @Wither final int foo; - - WitherPlain(int i, int foo) { - this.i = i; - this.foo = foo; - } -} diff --git a/test/transform/resource/before/WitherWithAbstract.java b/test/transform/resource/before/WitherWithAbstract.java deleted file mode 100644 index acc9094b..00000000 --- a/test/transform/resource/before/WitherWithAbstract.java +++ /dev/null @@ -1,3 +0,0 @@ -abstract class WitherWithAbstract { - @lombok.experimental.Wither String foo; -}
\ No newline at end of file diff --git a/test/transform/resource/before/WitherWithDollar.java b/test/transform/resource/before/WitherWithDollar.java deleted file mode 100644 index 8dd2572f..00000000 --- a/test/transform/resource/before/WitherWithDollar.java +++ /dev/null @@ -1,3 +0,0 @@ -class WitherWithDollar { - @lombok.experimental.Wither int $i; -} diff --git a/test/transform/resource/before/WitherWithGenerics.java b/test/transform/resource/before/WitherWithGenerics.java deleted file mode 100644 index 0b0fdd46..00000000 --- a/test/transform/resource/before/WitherWithGenerics.java +++ /dev/null @@ -1,9 +0,0 @@ -class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { - @lombok.experimental.Wither J test; - @lombok.experimental.Wither java.util.List<L> test2; - @lombok.experimental.Wither java.util.List<? extends L> test3; - int $i; - - public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { - } -}
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages b/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages index 506a3426..62387ec3 100644 --- a/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages +++ b/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages @@ -1,2 +1,2 @@ -2 @Getter, @Setter, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. +2 @Getter, @Setter, @With, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. 13 @Value is not allowed on builder classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/FlagUsages.java.messages b/test/transform/resource/messages-delombok/FlagUsages.java.messages index 13a148b1..795ff584 100644 --- a/test/transform/resource/messages-delombok/FlagUsages.java.messages +++ b/test/transform/resource/messages-delombok/FlagUsages.java.messages @@ -1,2 +1,2 @@ -5 Use of @Getter is flagged according to lombok configuration. -7 Use of any lombok.experimental feature is flagged according to lombok configuration. +4 Use of any lombok.experimental feature is flagged according to lombok configuration. +6 Use of @Getter is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages b/test/transform/resource/messages-delombok/WithAlreadyExists.java.messages index d5e30e28..d5e30e28 100644 --- a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/WithAlreadyExists.java.messages diff --git a/test/transform/resource/messages-delombok/WithOnStatic.java.messages b/test/transform/resource/messages-delombok/WithOnStatic.java.messages new file mode 100644 index 00000000..4637cfb4 --- /dev/null +++ b/test/transform/resource/messages-delombok/WithOnStatic.java.messages @@ -0,0 +1,2 @@ +2 Not generating withFoo for this field: With methods cannot be generated for static fields. +3 Not generating withBar for this field: With methods cannot be generated for static fields. diff --git a/test/transform/resource/messages-delombok/WithWithDollar.java.messages b/test/transform/resource/messages-delombok/WithWithDollar.java.messages new file mode 100644 index 00000000..b2368131 --- /dev/null +++ b/test/transform/resource/messages-delombok/WithWithDollar.java.messages @@ -0,0 +1 @@ +2 Not generating with$i for this field: With methods cannot be generated for fields starting with $. diff --git a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages deleted file mode 100644 index 3af59fa1..00000000 --- a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages +++ /dev/null @@ -1,2 +0,0 @@ -2 Not generating wither for this field: Withers cannot be generated for static fields. -3 Not generating wither for this field: Withers cannot be generated for static fields. diff --git a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages deleted file mode 100644 index 84603868..00000000 --- a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages +++ /dev/null @@ -1 +0,0 @@ -2 Not generating wither for this field: Withers cannot be generated for fields starting with $. diff --git a/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages b/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages index c5571b92..8969b48a 100644 --- a/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages +++ b/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages @@ -1,2 +1,2 @@ -2 @Getter, @Setter, @FieldDefaults, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. +2 @Getter, @Setter, @FieldDefaults, @With, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. 13 @Value is not allowed on builder classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/FlagUsages.java.messages b/test/transform/resource/messages-ecj/FlagUsages.java.messages index 13a148b1..795ff584 100644 --- a/test/transform/resource/messages-ecj/FlagUsages.java.messages +++ b/test/transform/resource/messages-ecj/FlagUsages.java.messages @@ -1,2 +1,2 @@ -5 Use of @Getter is flagged according to lombok configuration. -7 Use of any lombok.experimental feature is flagged according to lombok configuration. +4 Use of any lombok.experimental feature is flagged according to lombok configuration. +6 Use of @Getter is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages b/test/transform/resource/messages-ecj/WithAlreadyExists.java.messages index d5e30e28..d5e30e28 100644 --- a/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/WithAlreadyExists.java.messages diff --git a/test/transform/resource/messages-ecj/WithOnStatic.java.messages b/test/transform/resource/messages-ecj/WithOnStatic.java.messages new file mode 100644 index 00000000..4637cfb4 --- /dev/null +++ b/test/transform/resource/messages-ecj/WithOnStatic.java.messages @@ -0,0 +1,2 @@ +2 Not generating withFoo for this field: With methods cannot be generated for static fields. +3 Not generating withBar for this field: With methods cannot be generated for static fields. diff --git a/test/transform/resource/messages-ecj/WithWithDollar.java.messages b/test/transform/resource/messages-ecj/WithWithDollar.java.messages new file mode 100644 index 00000000..b2368131 --- /dev/null +++ b/test/transform/resource/messages-ecj/WithWithDollar.java.messages @@ -0,0 +1 @@ +2 Not generating with$i for this field: With methods cannot be generated for fields starting with $. diff --git a/test/transform/resource/messages-ecj/WitherAccessLevel.java.messages b/test/transform/resource/messages-ecj/WitherAccessLevel.java.messages new file mode 100644 index 00000000..4ba55bb8 --- /dev/null +++ b/test/transform/resource/messages-ecj/WitherAccessLevel.java.messages @@ -0,0 +1 @@ +4 The type Wither is deprecated diff --git a/test/transform/resource/messages-ecj/WitherOnStatic.java.messages b/test/transform/resource/messages-ecj/WitherOnStatic.java.messages deleted file mode 100644 index 3af59fa1..00000000 --- a/test/transform/resource/messages-ecj/WitherOnStatic.java.messages +++ /dev/null @@ -1,2 +0,0 @@ -2 Not generating wither for this field: Withers cannot be generated for static fields. -3 Not generating wither for this field: Withers cannot be generated for static fields. diff --git a/test/transform/resource/messages-ecj/WitherWithDollar.java.messages b/test/transform/resource/messages-ecj/WitherWithDollar.java.messages deleted file mode 100644 index 84603868..00000000 --- a/test/transform/resource/messages-ecj/WitherWithDollar.java.messages +++ /dev/null @@ -1 +0,0 @@ -2 Not generating wither for this field: Withers cannot be generated for fields starting with $. |