From 15df143df6d35dd64459d717a451a039eb26d761 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 13 Aug 2019 15:04:43 +0200 Subject: [checkerframework] A bit of a shadow feature because the checker framework folks need to do some work on their side. this update makes lombok generate a few checker framework annotations (if configured to do so) which let the checker framework add warnings and errors for example if you misuse builders, or ignore the return values of withers, etc. --- .../after-delombok/CheckerFrameworkBasic.java | 72 ++++++++ .../after-delombok/CheckerFrameworkBuilder.java | 106 +++++++++++ .../CheckerFrameworkSuperBuilder.java | 202 +++++++++++++++++++++ .../resource/after-ecj/CheckerFrameworkBasic.java | 59 ++++++ .../after-ecj/CheckerFrameworkBuilder.java | 79 ++++++++ .../after-ecj/CheckerFrameworkSuperBuilder.java | 142 +++++++++++++++ .../resource/before/CheckerFrameworkBasic.java | 11 ++ .../resource/before/CheckerFrameworkBuilder.java | 12 ++ .../before/CheckerFrameworkSuperBuilder.java | 19 ++ .../CheckerFrameworkBasic.java.messages | 4 + .../CheckerFrameworkBuilder.java.messages | 1 + .../CheckerFrameworkSuperBuilder.java.messages | 3 + .../CheckerFrameworkBasic.java.messages | 1 + .../CheckerFrameworkBuilder.java.messages | 1 + .../CheckerFrameworkSuperBuilder.java.messages | 1 + .../CheckerFrameworkBasic.java.messages | 10 + 16 files changed, 723 insertions(+) create mode 100644 test/transform/resource/after-delombok/CheckerFrameworkBasic.java create mode 100644 test/transform/resource/after-delombok/CheckerFrameworkBuilder.java create mode 100644 test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java create mode 100644 test/transform/resource/after-ecj/CheckerFrameworkBasic.java create mode 100644 test/transform/resource/after-ecj/CheckerFrameworkBuilder.java create mode 100644 test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java create mode 100644 test/transform/resource/before/CheckerFrameworkBasic.java create mode 100644 test/transform/resource/before/CheckerFrameworkBuilder.java create mode 100644 test/transform/resource/before/CheckerFrameworkSuperBuilder.java create mode 100644 test/transform/resource/messages-delombok/CheckerFrameworkBasic.java.messages create mode 100644 test/transform/resource/messages-delombok/CheckerFrameworkBuilder.java.messages create mode 100644 test/transform/resource/messages-delombok/CheckerFrameworkSuperBuilder.java.messages create mode 100644 test/transform/resource/messages-ecj/CheckerFrameworkBasic.java.messages create mode 100644 test/transform/resource/messages-ecj/CheckerFrameworkBuilder.java.messages create mode 100644 test/transform/resource/messages-ecj/CheckerFrameworkSuperBuilder.java.messages create mode 100644 test/transform/resource/messages-idempotent/CheckerFrameworkBasic.java.messages (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java new file mode 100644 index 00000000..b9d4e0fa --- /dev/null +++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java @@ -0,0 +1,72 @@ +class CheckerFrameworkBasic { + private final int x; + private final int y; + private int z; + @org.checkerframework.common.aliasing.qual.Unique + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBasic(final int x, final int y) { + this.x = x; + this.y = y; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public int getX() { + return this.x; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public int getY() { + return this.y; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public int getZ() { + return this.z; + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBasic setZ(final int z) { + this.z = z; + return this; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof CheckerFrameworkBasic)) return false; + final CheckerFrameworkBasic other = (CheckerFrameworkBasic) o; + if (!other.canEqual((java.lang.Object) this)) return false; + if (this.getX() != other.getX()) return false; + if (this.getY() != other.getY()) return false; + if (this.getZ() != other.getZ()) return false; + return true; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof CheckerFrameworkBasic; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + this.getX(); + result = result * PRIME + this.getY(); + result = result * PRIME + this.getZ(); + return result; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "CheckerFrameworkBasic(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBasic withX(final int x) { + return this.x == x ? this : new CheckerFrameworkBasic(x, this.y, this.z); + } +} diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java new file mode 100644 index 00000000..d21ad044 --- /dev/null +++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java @@ -0,0 +1,106 @@ +// skip-idempotent +import java.util.List; +class CheckerFrameworkBuilder { + int x; + int y; + int z; + List names; + @java.lang.SuppressWarnings("all") + private static int $default$x() { + return 5; + } + @org.checkerframework.common.aliasing.qual.Unique + @java.lang.SuppressWarnings("all") + CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { + this.x = x; + this.y = y; + this.z = z; + this.names = names; + } + @java.lang.SuppressWarnings("all") + public static class CheckerFrameworkBuilderBuilder { + @java.lang.SuppressWarnings("all") + private boolean x$set; + @java.lang.SuppressWarnings("all") + private int x$value; + @java.lang.SuppressWarnings("all") + private int y; + @java.lang.SuppressWarnings("all") + private int z; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList names; + @org.checkerframework.common.aliasing.qual.Unique + @java.lang.SuppressWarnings("all") + CheckerFrameworkBuilderBuilder() { + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilderBuilder x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) { + this.x$value = x; + x$set = true; + return this; + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilderBuilder y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) { + this.y = y; + return this; + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilderBuilder z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) { + this.z = z; + return this; + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilderBuilder name(final String name) { + if (this.names == null) this.names = new java.util.ArrayList(); + this.names.add(name); + return this; + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { + if (this.names == null) this.names = new java.util.ArrayList(); + this.names.addAll(names); + return this; + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilderBuilder clearNames() { + if (this.names != null) this.names.clear(); + return this; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public CheckerFrameworkBuilder build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { + java.util.List names; + switch (this.names == null ? 0 : this.names.size()) { + case 0: + names = java.util.Collections.emptyList(); + break; + case 1: + names = java.util.Collections.singletonList(this.names.get(0)); + break; + default: + names = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.names)); + } + int x$value = this.x$value; + if (!x$set) x$value = CheckerFrameworkBuilder.$default$x(); + return new CheckerFrameworkBuilder(x$value, y, z, names); + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; + } + } + @org.checkerframework.common.aliasing.qual.Unique + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public static CheckerFrameworkBuilderBuilder builder() { + return new CheckerFrameworkBuilderBuilder(); + } +} diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java new file mode 100644 index 00000000..40876369 --- /dev/null +++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java @@ -0,0 +1,202 @@ +// skip-idempotent +import java.util.List; +class CheckerFrameworkSuperBuilder { + public static class Parent { + int x; + int y; + int z; + List names; + @java.lang.SuppressWarnings("all") + private static int $default$x() { + return 5; + } + @java.lang.SuppressWarnings("all") + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + private boolean x$set; + @java.lang.SuppressWarnings("all") + private int x$value; + @java.lang.SuppressWarnings("all") + private int y; + @java.lang.SuppressWarnings("all") + private int z; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList names; + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) Parent this); + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") ParentBuilder this, final int x) { + this.x$value = x; + x$set = true; + return self(); + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") ParentBuilder this, final int y) { + this.y = y; + return self(); + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") ParentBuilder this, final int z) { + this.z = z; + return self(); + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B name(final String name) { + if (this.names == null) this.names = new java.util.ArrayList(); + this.names.add(name); + return self(); + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B names(final java.util.Collection names) { + if (this.names == null) this.names = new java.util.ArrayList(); + this.names.addAll(names); + return self(); + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B clearNames() { + if (this.names != null) this.names.clear(); + return self(); + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ParentBuilderImpl extends ParentBuilder { + @org.checkerframework.common.aliasing.qual.Unique + @java.lang.SuppressWarnings("all") + private ParentBuilderImpl() { + } + @java.lang.Override + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected ParentBuilderImpl self() { + return this; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public Parent build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { + return new Parent(this); + } + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected Parent(final ParentBuilder b) { + if (b.x$set) this.x = b.x$value; + else this.x = Parent.$default$x(); + this.y = b.y; + this.z = b.z; + java.util.List names; + switch (b.names == null ? 0 : b.names.size()) { + case 0: + names = java.util.Collections.emptyList(); + break; + case 1: + names = java.util.Collections.singletonList(b.names.get(0)); + break; + default: + names = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.names)); + } + this.names = names; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public static ParentBuilder builder() { + return new ParentBuilderImpl(); + } + } + public static class Child extends Parent { + int a; + int b; + @java.lang.SuppressWarnings("all") + private static int $default$a() { + return 1; + } + @java.lang.SuppressWarnings("all") + public static abstract class ChildBuilder> extends Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private boolean a$set; + @java.lang.SuppressWarnings("all") + private int a$value; + @java.lang.SuppressWarnings("all") + private int b; + @java.lang.Override + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods("b") Child this); + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B a(@org.checkerframework.checker.builder.qual.NotCalledMethods("a") ChildBuilder this, final int a) { + this.a$value = a; + a$set = true; + return self(); + } + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @java.lang.SuppressWarnings("all") + public B b(@org.checkerframework.checker.builder.qual.NotCalledMethods("b") ChildBuilder this, final int b) { + this.b = b; + return self(); + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "CheckerFrameworkSuperBuilder.Child.ChildBuilder(super=" + super.toString() + ", a$value=" + this.a$value + ", b=" + this.b + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ChildBuilderImpl extends ChildBuilder { + @org.checkerframework.common.aliasing.qual.Unique + @java.lang.SuppressWarnings("all") + private ChildBuilderImpl() { + } + @java.lang.Override + @org.checkerframework.checker.builder.qual.ReturnsReceiver + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected ChildBuilderImpl self() { + return this; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.Override + @java.lang.SuppressWarnings("all") + public Child build(@org.checkerframework.checker.builder.qual.CalledMethods("b") ChildBuilderImpl this) { + return new Child(this); + } + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + protected Child(final ChildBuilder b) { + super(b); + if (b.a$set) this.a = b.a$value; + else this.a = Child.$default$a(); + this.b = b.b; + } + @org.checkerframework.dataflow.qual.SideEffectFree + @java.lang.SuppressWarnings("all") + public static ChildBuilder builder() { + return new ChildBuilderImpl(); + } + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java new file mode 100644 index 00000000..03313c6d --- /dev/null +++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java @@ -0,0 +1,59 @@ +import lombok.Data; +import lombok.experimental.Accessors; +import lombok.experimental.Wither; +@Data @Accessors(chain = true) class CheckerFrameworkBasic { + private final @Wither int x; + private final int y; + private int z; + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBasic withX(final int x) { + return ((this.x == x) ? this : new CheckerFrameworkBasic(x, this.y, this.z)); + } + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getX() { + return this.x; + } + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getY() { + return this.y; + } + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getZ() { + return this.z; + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBasic setZ(final int z) { + this.z = z; + return this; + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + if ((o == this)) + return true; + if ((! (o instanceof CheckerFrameworkBasic))) + return false; + final CheckerFrameworkBasic other = (CheckerFrameworkBasic) o; + if ((! other.canEqual((java.lang.Object) this))) + return false; + if ((this.getX() != other.getX())) + return false; + if ((this.getY() != other.getY())) + return false; + if ((this.getZ() != other.getZ())) + return false; + return true; + } + protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + return (other instanceof CheckerFrameworkBasic); + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int hashCode() { + final int PRIME = 59; + int result = 1; + result = ((result * PRIME) + this.getX()); + result = ((result * PRIME) + this.getY()); + result = ((result * PRIME) + this.getZ()); + return result; + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (((((("CheckerFrameworkBasic(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); + } + public @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") CheckerFrameworkBasic(final int x, final int y) { + super(); + this.x = x; + this.y = y; + } +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java new file mode 100644 index 00000000..2baad9d9 --- /dev/null +++ b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java @@ -0,0 +1,79 @@ +import java.util.List; +import lombok.Builder; +import lombok.Singular; +@Builder class CheckerFrameworkBuilder { + public static @java.lang.SuppressWarnings("all") class CheckerFrameworkBuilderBuilder { + private @java.lang.SuppressWarnings("all") int x$value; + private @java.lang.SuppressWarnings("all") boolean x$set; + private @java.lang.SuppressWarnings("all") int y; + private @java.lang.SuppressWarnings("all") int z; + private @java.lang.SuppressWarnings("all") java.util.ArrayList names; + @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder() { + super(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder x(final @org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) { + this.x$value = x; + x$set = true; + return this; + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder y(final @org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) { + this.y = y; + return this; + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder z(final @org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) { + this.z = z; + return this; + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder name(final String name) { + if ((this.names == null)) + this.names = new java.util.ArrayList(); + this.names.add(name); + return this; + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { + if ((this.names == null)) + this.names = new java.util.ArrayList(); + this.names.addAll(names); + return this; + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder clearNames() { + if ((this.names != null)) + this.names.clear(); + return this; + } + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder build(final @org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { + java.util.List names; + switch (((this.names == null) ? 0 : this.names.size())) { + case 0 : + names = java.util.Collections.emptyList(); + break; + case 1 : + names = java.util.Collections.singletonList(this.names.get(0)); + break; + default : + names = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.names)); + } + return new CheckerFrameworkBuilder((x$set ? x$value : CheckerFrameworkBuilder.$default$x()), y, z, names); + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (((((((("CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); + } + } + @Builder.Default int x; + int y; + int z; + @Singular List names; + private static @java.lang.SuppressWarnings("all") int $default$x() { + return 5; + } + @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { + super(); + this.x = x; + this.y = y; + this.z = z; + this.names = names; + } + public static @org.checkerframework.common.aliasing.qual.Unique @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder builder() { + return new CheckerFrameworkBuilderBuilder(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java new file mode 100644 index 00000000..3901bfce --- /dev/null +++ b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java @@ -0,0 +1,142 @@ +import java.util.List; +import lombok.Singular; +class CheckerFrameworkSuperBuilder { + public static @lombok.experimental.SuperBuilder class Parent { + public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { + private @java.lang.SuppressWarnings("all") int x$value; + private @java.lang.SuppressWarnings("all") boolean x$set; + private @java.lang.SuppressWarnings("all") int y; + private @java.lang.SuppressWarnings("all") int z; + private @java.lang.SuppressWarnings("all") java.util.ArrayList names; + public ParentBuilder() { + } + protected abstract @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") B self(); + public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(final @org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) ParentBuilder this); + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B x(final @org.checkerframework.checker.builder.qual.NotCalledMethods("x") ParentBuilder this, final int x) { + this.x$value = x; + x$set = true; + return self(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B y(final @org.checkerframework.checker.builder.qual.NotCalledMethods("y") ParentBuilder this, final int y) { + this.y = y; + return self(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B z(final @org.checkerframework.checker.builder.qual.NotCalledMethods("z") ParentBuilder this, final int z) { + this.z = z; + return self(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B name(final String name) { + if ((this.names == null)) + this.names = new java.util.ArrayList(); + this.names.add(name); + return self(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B names(final java.util.Collection names) { + if ((this.names == null)) + this.names = new java.util.ArrayList(); + this.names.addAll(names); + return self(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B clearNames() { + if ((this.names != null)) + this.names.clear(); + return self(); + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (((((((("CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends ParentBuilder { + private ParentBuilderImpl() { + } + protected @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") ParentBuilderImpl self() { + return this; + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") Parent build(final @org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { + return new Parent(this); + } + } + @lombok.Builder.Default int x; + int y; + int z; + @Singular List names; + private static @java.lang.SuppressWarnings("all") int $default$x() { + return 5; + } + protected @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") Parent(final ParentBuilder b) { + super(); + if (b.x$set) + this.x = b.x$value; + else + this.x = Parent.$default$x(); + this.y = b.y; + this.z = b.z; + java.util.List names; + switch (((b.names == null) ? 0 : b.names.size())) { + case 0 : + names = java.util.Collections.emptyList(); + break; + case 1 : + names = java.util.Collections.singletonList(b.names.get(0)); + break; + default : + names = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.names)); + } + this.names = names; + } + public static @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") ParentBuilder builder() { + return new ParentBuilderImpl(); + } + } + public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") int a$value; + private @java.lang.SuppressWarnings("all") boolean a$set; + private @java.lang.SuppressWarnings("all") int b; + public ChildBuilder() { + } + protected abstract @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") B self(); + protected abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(final @org.checkerframework.checker.builder.qual.CalledMethods("b") ChildBuilder this); + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B a(final @org.checkerframework.checker.builder.qual.NotCalledMethods("a") ChildBuilder this, final int a) { + this.a$value = a; + a$set = true; + return self(); + } + public @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") B b(final @org.checkerframework.checker.builder.qual.NotCalledMethods("b") ChildBuilder this, final int b) { + this.b = b; + return self(); + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (((((("CheckerFrameworkSuperBuilder.Child.ChildBuilder(super=" + super.toString()) + ", a$value=") + this.a$value) + ", b=") + this.b) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends ChildBuilder { + private ChildBuilderImpl() { + } + protected @java.lang.Override @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") ChildBuilderImpl self() { + return this; + } + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") Child build(final @org.checkerframework.checker.builder.qual.CalledMethods("b") ChildBuilderImpl this) { + return new Child(this); + } + } + @lombok.Builder.Default int a; + int b; + private static @java.lang.SuppressWarnings("all") int $default$a() { + return 1; + } + protected @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") Child(final ChildBuilder b) { + super(b); + if (b.a$set) + this.a = b.a$value; + else + this.a = Child.$default$a(); + this.b = b.b; + } + public static @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") ChildBuilder builder() { + return new ChildBuilderImpl(); + } + } + CheckerFrameworkSuperBuilder() { + } +} diff --git a/test/transform/resource/before/CheckerFrameworkBasic.java b/test/transform/resource/before/CheckerFrameworkBasic.java new file mode 100644 index 00000000..5b59165a --- /dev/null +++ b/test/transform/resource/before/CheckerFrameworkBasic.java @@ -0,0 +1,11 @@ +//CONF: checkerframework = 3.0 +import lombok.Data; +import lombok.experimental.Accessors; +import lombok.experimental.Wither; + +@Data @Accessors(chain = true) +class CheckerFrameworkBasic { + @Wither private final int x; + private final int y; + private int z; +} diff --git a/test/transform/resource/before/CheckerFrameworkBuilder.java b/test/transform/resource/before/CheckerFrameworkBuilder.java new file mode 100644 index 00000000..4b501ab8 --- /dev/null +++ b/test/transform/resource/before/CheckerFrameworkBuilder.java @@ -0,0 +1,12 @@ +//CONF: checkerframework = true +import java.util.List; +import lombok.Builder; +import lombok.Singular; + +@Builder +class CheckerFrameworkBuilder { + @Builder.Default int x = 5; + int y; + int z; + @Singular List names; +} diff --git a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java new file mode 100644 index 00000000..74d50ef1 --- /dev/null +++ b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java @@ -0,0 +1,19 @@ +//CONF: checkerframework = true +import java.util.List; +import lombok.Singular; + +class CheckerFrameworkSuperBuilder { + @lombok.experimental.SuperBuilder + public static class Parent { + @lombok.Builder.Default int x = 5; + int y; + int z; + @Singular List names; + } + + @lombok.experimental.SuperBuilder + public static class Child extends Parent { + @lombok.Builder.Default int a = 1; + int b; + } +} diff --git a/test/transform/resource/messages-delombok/CheckerFrameworkBasic.java.messages b/test/transform/resource/messages-delombok/CheckerFrameworkBasic.java.messages new file mode 100644 index 00000000..9ee959a4 --- /dev/null +++ b/test/transform/resource/messages-delombok/CheckerFrameworkBasic.java.messages @@ -0,0 +1,4 @@ +6 package org.checkerframework.common.aliasing.qual does not exist +8 package org.checkerframework.dataflow.qual does not exist +9 package org.checkerframework.dataflow.qual does not exist +10 package org.checkerframework.dataflow.qual does not exist diff --git a/test/transform/resource/messages-delombok/CheckerFrameworkBuilder.java.messages b/test/transform/resource/messages-delombok/CheckerFrameworkBuilder.java.messages new file mode 100644 index 00000000..8c736705 --- /dev/null +++ b/test/transform/resource/messages-delombok/CheckerFrameworkBuilder.java.messages @@ -0,0 +1 @@ +6 package org.checkerframework.common.aliasing.qual does not exist diff --git a/test/transform/resource/messages-delombok/CheckerFrameworkSuperBuilder.java.messages b/test/transform/resource/messages-delombok/CheckerFrameworkSuperBuilder.java.messages new file mode 100644 index 00000000..5dd6251a --- /dev/null +++ b/test/transform/resource/messages-delombok/CheckerFrameworkSuperBuilder.java.messages @@ -0,0 +1,3 @@ +6 package org.checkerframework.dataflow.qual does not exist +-1 package org.checkerframework.checker.builder.qual does not exist +14 package org.checkerframework.dataflow.qual does not exist diff --git a/test/transform/resource/messages-ecj/CheckerFrameworkBasic.java.messages b/test/transform/resource/messages-ecj/CheckerFrameworkBasic.java.messages new file mode 100644 index 00000000..9bfcba0c --- /dev/null +++ b/test/transform/resource/messages-ecj/CheckerFrameworkBasic.java.messages @@ -0,0 +1 @@ +8 org.checkerframework cannot be resolved to a type diff --git a/test/transform/resource/messages-ecj/CheckerFrameworkBuilder.java.messages b/test/transform/resource/messages-ecj/CheckerFrameworkBuilder.java.messages new file mode 100644 index 00000000..d385a95c --- /dev/null +++ b/test/transform/resource/messages-ecj/CheckerFrameworkBuilder.java.messages @@ -0,0 +1 @@ +6 org.checkerframework cannot be resolved to a type diff --git a/test/transform/resource/messages-ecj/CheckerFrameworkSuperBuilder.java.messages b/test/transform/resource/messages-ecj/CheckerFrameworkSuperBuilder.java.messages new file mode 100644 index 00000000..d385a95c --- /dev/null +++ b/test/transform/resource/messages-ecj/CheckerFrameworkSuperBuilder.java.messages @@ -0,0 +1 @@ +6 org.checkerframework cannot be resolved to a type diff --git a/test/transform/resource/messages-idempotent/CheckerFrameworkBasic.java.messages b/test/transform/resource/messages-idempotent/CheckerFrameworkBasic.java.messages new file mode 100644 index 00000000..80694a06 --- /dev/null +++ b/test/transform/resource/messages-idempotent/CheckerFrameworkBasic.java.messages @@ -0,0 +1,10 @@ +5 package org.checkerframework.common.aliasing.qual does not exist +11 package org.checkerframework.dataflow.qual does not exist +16 package org.checkerframework.dataflow.qual does not exist +21 package org.checkerframework.dataflow.qual does not exist +26 package org.checkerframework.checker.builder.qual does not exist +32 package org.checkerframework.dataflow.qual does not exist +45 package org.checkerframework.dataflow.qual does not exist +50 package org.checkerframework.dataflow.qual does not exist +61 package org.checkerframework.dataflow.qual does not exist +67 package org.checkerframework.dataflow.qual does not exist -- cgit From c11edbf032ce27e448faa00d37245665942095af Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 26 Aug 2019 21:41:10 +0200 Subject: [With] renaming lombok.experimental.Wither to lombok.experimental.With --- .../after-delombok/SetterAndWithMethodJavadoc.java | 46 +++++++++++ .../after-delombok/SetterAndWitherJavadoc.java | 46 ----------- .../resource/after-delombok/WithAlreadyExists.java | 71 +++++++++++++++++ .../after-delombok/WithAndAllArgsConstructor.java | 22 ++++++ .../after-delombok/WithMethodAbstract.java | 5 ++ .../after-delombok/WithMethodMarkedDeprecated.java | 23 ++++++ .../resource/after-delombok/WithOnClass.java | 54 +++++++++++++ .../resource/after-delombok/WithOnStatic.java | 4 + .../resource/after-delombok/WithPlain.java | 16 ++++ .../resource/after-delombok/WithWithDollar.java | 3 + .../resource/after-delombok/WithWithGenerics.java | 20 +++++ .../resource/after-delombok/WithWithTypeAnnos.java | 21 +++++ .../after-delombok/WitherAlreadyExists.java | 71 ----------------- .../WitherAndAllArgsConstructor.java | 22 ------ .../resource/after-delombok/WitherDeprecated.java | 23 ------ .../resource/after-delombok/WitherOnClass.java | 54 ------------- .../resource/after-delombok/WitherOnStatic.java | 4 - .../resource/after-delombok/WitherPlain.java | 16 ---- .../resource/after-delombok/WitherTypeAnnos.java | 21 ----- .../after-delombok/WitherWithAbstract.java | 5 -- .../resource/after-delombok/WitherWithDollar.java | 3 - .../after-delombok/WitherWithGenerics.java | 20 ----- .../resource/after-ecj/CheckerFrameworkBasic.java | 4 +- .../after-ecj/SetterAndWithMethodJavadoc.java | 22 ++++++ .../resource/after-ecj/SetterAndWitherJavadoc.java | 22 ------ .../resource/after-ecj/WithAlreadyExists.java | 78 +++++++++++++++++++ .../after-ecj/WithAndAllArgsConstructor.java | 20 +++++ .../resource/after-ecj/WithMethodAbstract.java | 7 ++ .../after-ecj/WithMethodMarkedDeprecated.java | 14 ++++ test/transform/resource/after-ecj/WithOnClass.java | 52 +++++++++++++ .../transform/resource/after-ecj/WithOnStatic.java | 9 +++ test/transform/resource/after-ecj/WithPlain.java | 16 ++++ .../resource/after-ecj/WithWithDollar.java | 6 ++ .../resource/after-ecj/WithWithGenerics.java | 18 +++++ .../resource/after-ecj/WithWithTypeAnnos.java | 18 +++++ .../resource/after-ecj/WitherAlreadyExists.java | 78 ------------------- .../after-ecj/WitherAndAllArgsConstructor.java | 20 ----- .../resource/after-ecj/WitherDeprecated.java | 14 ---- .../resource/after-ecj/WitherOnClass.java | 52 ------------- .../resource/after-ecj/WitherOnStatic.java | 9 --- test/transform/resource/after-ecj/WitherPlain.java | 16 ---- .../resource/after-ecj/WitherTypeAnnos.java | 18 ----- .../resource/after-ecj/WitherWithAbstract.java | 7 -- .../resource/after-ecj/WitherWithDollar.java | 6 -- .../resource/after-ecj/WitherWithGenerics.java | 18 ----- .../resource/before/BuilderInvalidUse.java | 2 +- .../resource/before/CheckerFrameworkBasic.java | 4 +- test/transform/resource/before/FlagUsages.java | 3 +- .../before/SetterAndWithMethodJavadoc.java | 26 +++++++ .../resource/before/SetterAndWitherJavadoc.java | 26 ------- .../resource/before/WithAlreadyExists.java | 89 ++++++++++++++++++++++ .../resource/before/WithAndAllArgsConstructor.java | 12 +++ .../resource/before/WithMethodAbstract.java | 3 + .../before/WithMethodMarkedDeprecated.java | 15 ++++ test/transform/resource/before/WithOnClass.java | 45 +++++++++++ test/transform/resource/before/WithOnStatic.java | 4 + test/transform/resource/before/WithPlain.java | 10 +++ test/transform/resource/before/WithWithDollar.java | 3 + .../resource/before/WithWithGenerics.java | 9 +++ .../resource/before/WithWithTypeAnnos.java | 18 +++++ .../resource/before/WitherAlreadyExists.java | 89 ---------------------- .../before/WitherAndAllArgsConstructor.java | 12 --- .../resource/before/WitherDeprecated.java | 15 ---- test/transform/resource/before/WitherOnClass.java | 45 ----------- test/transform/resource/before/WitherOnStatic.java | 4 - test/transform/resource/before/WitherPlain.java | 10 --- .../transform/resource/before/WitherTypeAnnos.java | 18 ----- .../resource/before/WitherWithAbstract.java | 3 - .../resource/before/WitherWithDollar.java | 3 - .../resource/before/WitherWithGenerics.java | 9 --- .../BuilderInvalidUse.java.messages | 2 +- .../messages-delombok/FlagUsages.java.messages | 4 +- .../WithAlreadyExists.java.messages | 7 ++ .../messages-delombok/WithOnStatic.java.messages | 2 + .../messages-delombok/WithWithDollar.java.messages | 1 + .../WitherAlreadyExists.java.messages | 7 -- .../messages-delombok/WitherOnStatic.java.messages | 2 - .../WitherWithDollar.java.messages | 1 - .../messages-ecj/BuilderInvalidUse.java.messages | 2 +- .../resource/messages-ecj/FlagUsages.java.messages | 4 +- .../messages-ecj/WithAlreadyExists.java.messages | 7 ++ .../messages-ecj/WithOnStatic.java.messages | 2 + .../messages-ecj/WithWithDollar.java.messages | 1 + .../messages-ecj/WitherAccessLevel.java.messages | 1 + .../messages-ecj/WitherAlreadyExists.java.messages | 7 -- .../messages-ecj/WitherOnStatic.java.messages | 2 - .../messages-ecj/WitherWithDollar.java.messages | 1 - 87 files changed, 813 insertions(+), 811 deletions(-) create mode 100644 test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java delete mode 100644 test/transform/resource/after-delombok/SetterAndWitherJavadoc.java create mode 100644 test/transform/resource/after-delombok/WithAlreadyExists.java create mode 100644 test/transform/resource/after-delombok/WithAndAllArgsConstructor.java create mode 100644 test/transform/resource/after-delombok/WithMethodAbstract.java create mode 100644 test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java create mode 100644 test/transform/resource/after-delombok/WithOnClass.java create mode 100644 test/transform/resource/after-delombok/WithOnStatic.java create mode 100644 test/transform/resource/after-delombok/WithPlain.java create mode 100644 test/transform/resource/after-delombok/WithWithDollar.java create mode 100644 test/transform/resource/after-delombok/WithWithGenerics.java create mode 100644 test/transform/resource/after-delombok/WithWithTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/WitherAlreadyExists.java delete mode 100644 test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java delete mode 100644 test/transform/resource/after-delombok/WitherDeprecated.java delete mode 100644 test/transform/resource/after-delombok/WitherOnClass.java delete mode 100644 test/transform/resource/after-delombok/WitherOnStatic.java delete mode 100644 test/transform/resource/after-delombok/WitherPlain.java delete mode 100644 test/transform/resource/after-delombok/WitherTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/WitherWithAbstract.java delete mode 100644 test/transform/resource/after-delombok/WitherWithDollar.java delete mode 100644 test/transform/resource/after-delombok/WitherWithGenerics.java create mode 100644 test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java delete mode 100644 test/transform/resource/after-ecj/SetterAndWitherJavadoc.java create mode 100644 test/transform/resource/after-ecj/WithAlreadyExists.java create mode 100644 test/transform/resource/after-ecj/WithAndAllArgsConstructor.java create mode 100644 test/transform/resource/after-ecj/WithMethodAbstract.java create mode 100644 test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java create mode 100644 test/transform/resource/after-ecj/WithOnClass.java create mode 100644 test/transform/resource/after-ecj/WithOnStatic.java create mode 100644 test/transform/resource/after-ecj/WithPlain.java create mode 100644 test/transform/resource/after-ecj/WithWithDollar.java create mode 100644 test/transform/resource/after-ecj/WithWithGenerics.java create mode 100644 test/transform/resource/after-ecj/WithWithTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/WitherAlreadyExists.java delete mode 100644 test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java delete mode 100644 test/transform/resource/after-ecj/WitherDeprecated.java delete mode 100644 test/transform/resource/after-ecj/WitherOnClass.java delete mode 100644 test/transform/resource/after-ecj/WitherOnStatic.java delete mode 100644 test/transform/resource/after-ecj/WitherPlain.java delete mode 100644 test/transform/resource/after-ecj/WitherTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/WitherWithAbstract.java delete mode 100644 test/transform/resource/after-ecj/WitherWithDollar.java delete mode 100644 test/transform/resource/after-ecj/WitherWithGenerics.java create mode 100644 test/transform/resource/before/SetterAndWithMethodJavadoc.java delete mode 100644 test/transform/resource/before/SetterAndWitherJavadoc.java create mode 100644 test/transform/resource/before/WithAlreadyExists.java create mode 100644 test/transform/resource/before/WithAndAllArgsConstructor.java create mode 100644 test/transform/resource/before/WithMethodAbstract.java create mode 100644 test/transform/resource/before/WithMethodMarkedDeprecated.java create mode 100644 test/transform/resource/before/WithOnClass.java create mode 100644 test/transform/resource/before/WithOnStatic.java create mode 100644 test/transform/resource/before/WithPlain.java create mode 100644 test/transform/resource/before/WithWithDollar.java create mode 100644 test/transform/resource/before/WithWithGenerics.java create mode 100644 test/transform/resource/before/WithWithTypeAnnos.java delete mode 100644 test/transform/resource/before/WitherAlreadyExists.java delete mode 100644 test/transform/resource/before/WitherAndAllArgsConstructor.java delete mode 100644 test/transform/resource/before/WitherDeprecated.java delete mode 100644 test/transform/resource/before/WitherOnClass.java delete mode 100644 test/transform/resource/before/WitherOnStatic.java delete mode 100644 test/transform/resource/before/WitherPlain.java delete mode 100644 test/transform/resource/before/WitherTypeAnnos.java delete mode 100644 test/transform/resource/before/WitherWithAbstract.java delete mode 100644 test/transform/resource/before/WitherWithDollar.java delete mode 100644 test/transform/resource/before/WitherWithGenerics.java create mode 100644 test/transform/resource/messages-delombok/WithAlreadyExists.java.messages create mode 100644 test/transform/resource/messages-delombok/WithOnStatic.java.messages create mode 100644 test/transform/resource/messages-delombok/WithWithDollar.java.messages delete mode 100644 test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages delete mode 100644 test/transform/resource/messages-delombok/WitherOnStatic.java.messages delete mode 100644 test/transform/resource/messages-delombok/WitherWithDollar.java.messages create mode 100644 test/transform/resource/messages-ecj/WithAlreadyExists.java.messages create mode 100644 test/transform/resource/messages-ecj/WithOnStatic.java.messages create mode 100644 test/transform/resource/messages-ecj/WithWithDollar.java.messages create mode 100644 test/transform/resource/messages-ecj/WitherAccessLevel.java.messages delete mode 100644 test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages delete mode 100644 test/transform/resource/messages-ecj/WitherOnStatic.java.messages delete mode 100644 test/transform/resource/messages-ecj/WitherWithDollar.java.messages (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java new file mode 100644 index 00000000..97524b9d --- /dev/null +++ b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java @@ -0,0 +1,46 @@ +class SetterAndWithMethodJavadoc { + /** + * Some value. + */ + int i; + /** + * Some other value. + */ + int j; + SetterAndWithMethodJavadoc(int i, int j) { + this.i = i; + this.j = j; + } + /** + * Some value. + * @param the new value + */ + @java.lang.SuppressWarnings("all") + public void setI(final int i) { + this.i = i; + } + /** + * Some value. + * @param the new value + */ + @java.lang.SuppressWarnings("all") + public SetterAndWithMethodJavadoc withI(final int i) { + return this.i == i ? this : new SetterAndWithMethodJavadoc(i, this.j); + } + /** + * Set some other value. + * @param the new other value + */ + @java.lang.SuppressWarnings("all") + public void setJ(final int j) { + this.j = j; + } + /** + * Reinstantiate with some other value. + * @param the other new other value + */ + @java.lang.SuppressWarnings("all") + public SetterAndWithMethodJavadoc withJ(final int j) { + return this.j == j ? this : new SetterAndWithMethodJavadoc(this.i, j); + } +} diff --git a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java b/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java deleted file mode 100644 index 8c0505e7..00000000 --- a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java +++ /dev/null @@ -1,46 +0,0 @@ -class SetterAndWitherJavadoc { - /** - * Some value. - */ - int i; - /** - * Some other value. - */ - int j; - SetterAndWitherJavadoc(int i, int j) { - this.i = i; - this.j = j; - } - /** - * Some value. - * @param the new value - */ - @java.lang.SuppressWarnings("all") - public void setI(final int i) { - this.i = i; - } - /** - * Some value. - * @param the new value - */ - @java.lang.SuppressWarnings("all") - public SetterAndWitherJavadoc withI(final int i) { - return this.i == i ? this : new SetterAndWitherJavadoc(i, this.j); - } - /** - * Set some other value. - * @param the new other value - */ - @java.lang.SuppressWarnings("all") - public void setJ(final int j) { - this.j = j; - } - /** - * Reinstantiate with some other value. - * @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); - } -} 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 { + J test; + java.util.List test2; + final int x = 10; + int y = 20; + final int z; + @java.lang.SuppressWarnings("all") + public WithAndAllArgsConstructor(final J test, final java.util.List 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 withTest(final J test) { + return this.test == test ? this : new WithAndAllArgsConstructor(test, this.test2, this.y, this.z); + } + @java.lang.SuppressWarnings("all") + public WithAndAllArgsConstructor withTest2(final java.util.List test2) { + return this.test2 == test2 ? this : new WithAndAllArgsConstructor(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/WithOnStatic.java b/test/transform/resource/after-delombok/WithOnStatic.java new file mode 100644 index 00000000..b234f0d6 --- /dev/null +++ b/test/transform/resource/after-delombok/WithOnStatic.java @@ -0,0 +1,4 @@ +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 { + J test; + java.util.List test2; + java.util.List test3; + int $i; + public WithWithGenerics(J test, java.util.List test2, java.util.List test3) { + } + @java.lang.SuppressWarnings("all") + public WithWithGenerics withTest(final J test) { + return this.test == test ? this : new WithWithGenerics(test, this.test2, this.test3); + } + @java.lang.SuppressWarnings("all") + public WithWithGenerics withTest2(final java.util.List test2) { + return this.test2 == test2 ? this : new WithWithGenerics(this.test, test2, this.test3); + } + @java.lang.SuppressWarnings("all") + public WithWithGenerics withTest3(final java.util.List test3) { + return this.test3 == test3 ? this : new WithWithGenerics(this.test, this.test2, test3); + } +} diff --git a/test/transform/resource/after-delombok/WithWithTypeAnnos.java b/test/transform/resource/after-delombok/WithWithTypeAnnos.java new file mode 100644 index 00000000..bf7559ba --- /dev/null +++ b/test/transform/resource/after-delombok/WithWithTypeAnnos.java @@ -0,0 +1,21 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) +@interface TA { +} +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) +@interface TB { +} +class WithWithTypeAnnos { + @TA + @TB + final List foo; + WithWithTypeAnnos(@TA @TB List foo) { + this.foo = foo; + } + @java.lang.SuppressWarnings("all") + public WithWithTypeAnnos withFoo(@TA final List 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