From e95680a76733c22ee5937a586ee50c703d5ba621 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 20 Jan 2020 15:25:08 +0100 Subject: [issue #2221] [issue #788] Lombok now adds nullity annotations. Which 'flavour' is defined in lombok.config; applied to toString, equals, canEqual, and plural-form of `@Singular`. --- .../resource/before/BuilderSingularNullBehavior2.java | 11 +++++++++++ test/transform/resource/before/EqualsAndHashCodeWithNNBD.java | 8 -------- test/transform/resource/before/NullLibrary1.java | 7 +++++++ test/transform/resource/before/NullLibrary2.java | 7 +++++++ 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 test/transform/resource/before/BuilderSingularNullBehavior2.java delete mode 100644 test/transform/resource/before/EqualsAndHashCodeWithNNBD.java create mode 100644 test/transform/resource/before/NullLibrary1.java create mode 100644 test/transform/resource/before/NullLibrary2.java (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/BuilderSingularNullBehavior2.java b/test/transform/resource/before/BuilderSingularNullBehavior2.java new file mode 100644 index 00000000..720cf5a8 --- /dev/null +++ b/test/transform/resource/before/BuilderSingularNullBehavior2.java @@ -0,0 +1,11 @@ +//CONF: lombok.addNullAnnotations = checkerframework +import java.util.List; + +import lombok.Singular; +import lombok.Singular.NullCollectionBehavior; + +@lombok.Builder +class BuilderSingularNullBehavior2 { + @Singular(nullBehavior = Singular.NullCollectionBehavior.JDK) private List locations; + @Singular(nullBehavior = lombok.Singular.NullCollectionBehavior.IGNORE) private List doohickeys; +} diff --git a/test/transform/resource/before/EqualsAndHashCodeWithNNBD.java b/test/transform/resource/before/EqualsAndHashCodeWithNNBD.java deleted file mode 100644 index dc86cb55..00000000 --- a/test/transform/resource/before/EqualsAndHashCodeWithNNBD.java +++ /dev/null @@ -1,8 +0,0 @@ -// version 8: -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -class EqualsAndHashCodeWithNNBD { - @lombok.EqualsAndHashCode @org.eclipse.jdt.annotation.NonNullByDefault - static class Inner { - } -} diff --git a/test/transform/resource/before/NullLibrary1.java b/test/transform/resource/before/NullLibrary1.java new file mode 100644 index 00000000..95433270 --- /dev/null +++ b/test/transform/resource/before/NullLibrary1.java @@ -0,0 +1,7 @@ +//CONF: lombok.addNullAnnotations = eclipse +@lombok.EqualsAndHashCode +@lombok.ToString +@lombok.AllArgsConstructor +public class NullLibrary1 { + @lombok.With String foo; +} diff --git a/test/transform/resource/before/NullLibrary2.java b/test/transform/resource/before/NullLibrary2.java new file mode 100644 index 00000000..17b1e6e0 --- /dev/null +++ b/test/transform/resource/before/NullLibrary2.java @@ -0,0 +1,7 @@ +//CONF: lombok.addNullAnnotations = spring +@lombok.EqualsAndHashCode +@lombok.ToString +@lombok.AllArgsConstructor +public class NullLibrary2 { + @lombok.With String foo; +} -- cgit