aboutsummaryrefslogtreecommitdiff
path: root/test/transform
diff options
context:
space:
mode:
Diffstat (limited to 'test/transform')
-rw-r--r--test/transform/resource/after-delombok/ConstructorsWithAccessors.java8
-rw-r--r--test/transform/resource/after-delombok/DataConfiguration.java4
-rw-r--r--test/transform/resource/after-delombok/DataOnLocalClass.java4
-rw-r--r--test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java46
-rw-r--r--test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java1
-rw-r--r--test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java27
-rw-r--r--test/transform/resource/after-delombok/FieldNameConstantsBasic.java8
-rw-r--r--test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java4
-rw-r--r--test/transform/resource/after-delombok/FieldNameConstantsWeird.java6
-rw-r--r--test/transform/resource/after-delombok/GetterOnMethodErrors.java9
-rw-r--r--test/transform/resource/after-delombok/GetterOnMethodOnType.java14
-rw-r--r--test/transform/resource/after-delombok/InnerClass.java3
-rw-r--r--test/transform/resource/after-delombok/LoggerFlogger.java14
-rw-r--r--test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java73
-rw-r--r--test/transform/resource/after-delombok/NonNullOnParameter.java16
-rw-r--r--test/transform/resource/after-delombok/NonNullOnParameterAbstract.java2
-rw-r--r--test/transform/resource/after-delombok/NonNullOnParameterOfDefaultMethod.java2
-rw-r--r--test/transform/resource/after-delombok/NonNullPlain.java4
-rw-r--r--test/transform/resource/after-delombok/NonNullWithAlternateException.java4
-rw-r--r--test/transform/resource/after-delombok/NonNullWithSneakyThrows.java2
-rw-r--r--test/transform/resource/after-delombok/PrivateNoArgsConstructor.java236
-rw-r--r--test/transform/resource/after-delombok/SetterOnClass.java2
-rw-r--r--test/transform/resource/after-delombok/ToStringNewStyle.java18
-rw-r--r--test/transform/resource/after-delombok/WitherOnClass.java2
-rw-r--r--test/transform/resource/after-ecj/ConstructorsWithAccessors.java8
-rw-r--r--test/transform/resource/after-ecj/DataConfiguration.java4
-rw-r--r--test/transform/resource/after-ecj/DataOnLocalClass.java4
-rw-r--r--test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java53
-rw-r--r--test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java30
-rw-r--r--test/transform/resource/after-ecj/FieldNameConstantsBasic.java15
-rw-r--r--test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java9
-rw-r--r--test/transform/resource/after-ecj/FieldNameConstantsWeird.java13
-rw-r--r--test/transform/resource/after-ecj/GetterOnMethodErrors.java14
-rw-r--r--test/transform/resource/after-ecj/GetterOnMethodOnType.java13
-rw-r--r--test/transform/resource/after-ecj/LoggerFlogger.java30
-rw-r--r--test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java68
-rw-r--r--test/transform/resource/after-ecj/NonNullOnParameter.java16
-rw-r--r--test/transform/resource/after-ecj/NonNullOnParameterAbstract.java2
-rw-r--r--test/transform/resource/after-ecj/NonNullOnParameterOfDefaultMethod.java2
-rw-r--r--test/transform/resource/after-ecj/NonNullPlain.java4
-rw-r--r--test/transform/resource/after-ecj/NonNullWithAlternateException.java4
-rw-r--r--test/transform/resource/after-ecj/NonNullWithSneakyThrows.java2
-rw-r--r--test/transform/resource/after-ecj/PrivateNoArgsConstructor.java219
-rw-r--r--test/transform/resource/after-ecj/SetterOnClass.java2
-rw-r--r--test/transform/resource/after-ecj/ToStringNewStyle.java20
-rw-r--r--test/transform/resource/after-ecj/WitherOnClass.java2
-rw-r--r--test/transform/resource/before/BuilderWithRecursiveGenerics.java2
-rw-r--r--test/transform/resource/before/DataConfiguration.java1
-rw-r--r--test/transform/resource/before/EqualsAndHashCodeNewStyle.java16
-rw-r--r--test/transform/resource/before/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java6
-rw-r--r--test/transform/resource/before/FieldNameConstantsBasic.java11
-rw-r--r--test/transform/resource/before/FieldNameConstantsConfigKeys.java7
-rw-r--r--test/transform/resource/before/FieldNameConstantsWeird.java12
-rw-r--r--test/transform/resource/before/GetterOnMethodErrors.java6
-rw-r--r--test/transform/resource/before/GetterOnMethodOnType.java5
-rw-r--r--test/transform/resource/before/LoggerFlogger.java16
-rw-r--r--test/transform/resource/before/NoPrivateNoArgsConstructor.java12
-rw-r--r--test/transform/resource/before/PrivateNoArgsConstructor.java41
-rw-r--r--test/transform/resource/before/ToStringNewStyle.java15
-rw-r--r--test/transform/resource/before/ToStringWithConstantRefInOf.java10
-rw-r--r--test/transform/resource/messages-delombok/FieldNameConstantsWeird.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/ToStringWithConstantRefInOf.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/FieldNameConstantsWeird.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/ToStringWithConstantRefInOf.java.messages1
66 files changed, 1130 insertions, 79 deletions
diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
index dd4ce12f..2e09b2df 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
@@ -26,16 +26,16 @@ class ConstructorsWithAccessorsNonNull {
@java.lang.SuppressWarnings("all")
public ConstructorsWithAccessorsNonNull(@lombok.NonNull final Integer plower, @lombok.NonNull final Integer upper, @lombok.NonNull final Integer huh, @lombok.NonNull final Integer _huh2) {
if (plower == null) {
- throw new java.lang.NullPointerException("plower");
+ throw new java.lang.NullPointerException("plower is marked @NonNull but is null");
}
if (upper == null) {
- throw new java.lang.NullPointerException("upper");
+ throw new java.lang.NullPointerException("upper is marked @NonNull but is null");
}
if (huh == null) {
- throw new java.lang.NullPointerException("huh");
+ throw new java.lang.NullPointerException("huh is marked @NonNull but is null");
}
if (_huh2 == null) {
- throw new java.lang.NullPointerException("_huh2");
+ throw new java.lang.NullPointerException("_huh2 is marked @NonNull but is null");
}
this.plower = plower;
this.pUpper = upper;
diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java
index b71e1c81..6771a6a7 100644
--- a/test/transform/resource/after-delombok/DataConfiguration.java
+++ b/test/transform/resource/after-delombok/DataConfiguration.java
@@ -5,6 +5,10 @@ class DataConfiguration {
this.x = x;
}
@java.lang.SuppressWarnings("all")
+ private DataConfiguration() {
+ this.x = 0;
+ }
+ @java.lang.SuppressWarnings("all")
public int getX() {
return this.x;
}
diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index 84817897..d611490b 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -64,7 +64,7 @@ class DataOnLocalClass2 {
@java.lang.SuppressWarnings("all")
public InnerLocal(@lombok.NonNull final String name) {
if (name == null) {
- throw new java.lang.NullPointerException("name");
+ throw new java.lang.NullPointerException("name is marked @NonNull but is null");
}
this.name = name;
}
@@ -76,7 +76,7 @@ class DataOnLocalClass2 {
@java.lang.SuppressWarnings("all")
public void setName(@lombok.NonNull final String name) {
if (name == null) {
- throw new java.lang.NullPointerException("name");
+ throw new java.lang.NullPointerException("name is marked @NonNull but is null");
}
this.name = name;
}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java
new file mode 100644
index 00000000..59c7b806
--- /dev/null
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java
@@ -0,0 +1,46 @@
+public class EqualsAndHashCodeNewStyle {
+ int b;
+ double c;
+ int f;
+ int d;
+ int f() {
+ return 0;
+ }
+ int g;
+ long i() {
+ return 0;
+ }
+ int j;
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof EqualsAndHashCodeNewStyle)) return false;
+ final EqualsAndHashCodeNewStyle other = (EqualsAndHashCodeNewStyle) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.b != other.b) return false;
+ if (java.lang.Double.compare(this.c, other.c) != 0) return false;
+ if (this.d != other.d) return false;
+ if (this.f() != other.f()) return false;
+ if (this.i() != other.i()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof EqualsAndHashCodeNewStyle;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.b;
+ final long $c = java.lang.Double.doubleToLongBits(this.c);
+ result = result * PRIME + (int) ($c >>> 32 ^ $c);
+ result = result * PRIME + this.d;
+ result = result * PRIME + this.f();
+ final long $$i = this.i();
+ result = result * PRIME + (int) ($$i >>> 32 ^ $$i);
+ return result;
+ }
+}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java
index 501d45a1..9eb3cdb3 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java
@@ -1,3 +1,4 @@
+//version 7:
public class EqualsAndHashCodeWithGenericsOnInners<A> {
class Inner<B> {
int x;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java
new file mode 100644
index 00000000..ed25b317
--- /dev/null
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java
@@ -0,0 +1,27 @@
+public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces<A> {
+ class Inner<B> {
+ int x;
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner)) return false;
+ final EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner<?> other = (EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner<?>) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.x != other.x) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.x;
+ return result;
+ }
+ }
+}
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java
new file mode 100644
index 00000000..4e547aa5
--- /dev/null
+++ b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java
@@ -0,0 +1,8 @@
+public class FieldNameConstantsBasic {
+ protected static final java.lang.String FIELD_I_AM_A_DVD_PLAYER = "iAmADvdPlayer";
+ public static final java.lang.String FIELD_BUT_PRINT_ME_PLEASE = "butPrintMePlease";
+ String iAmADvdPlayer;
+ int $skipMe;
+ static double skipMeToo;
+ String butPrintMePlease;
+}
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java
new file mode 100644
index 00000000..c71b9264
--- /dev/null
+++ b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java
@@ -0,0 +1,4 @@
+public class FieldNameConstantsConfigKeys {
+ public static final java.lang.String I_AM_A_DVD_PLAYER_SFX = "iAmADvdPlayer";
+ String iAmADvdPlayer;
+}
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsWeird.java b/test/transform/resource/after-delombok/FieldNameConstantsWeird.java
new file mode 100644
index 00000000..6940f628
--- /dev/null
+++ b/test/transform/resource/after-delombok/FieldNameConstantsWeird.java
@@ -0,0 +1,6 @@
+public class FieldNameConstantsWeird {
+ public static final java.lang.String FIELD_AZ = "A";
+ String iAmADvdPlayer;
+ String X;
+ String A;
+}
diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors.java b/test/transform/resource/after-delombok/GetterOnMethodErrors.java
deleted file mode 100644
index a69966ec..00000000
--- a/test/transform/resource/after-delombok/GetterOnMethodErrors.java
+++ /dev/null
@@ -1,9 +0,0 @@
-class PlaceFillerToMakeSurePositionIsRelevant {
-}
-class GetterOnMethodErrors {
- private int test;
- @java.lang.SuppressWarnings("all")
- public int getTest() {
- return this.test;
- }
-}
diff --git a/test/transform/resource/after-delombok/GetterOnMethodOnType.java b/test/transform/resource/after-delombok/GetterOnMethodOnType.java
new file mode 100644
index 00000000..625909c1
--- /dev/null
+++ b/test/transform/resource/after-delombok/GetterOnMethodOnType.java
@@ -0,0 +1,14 @@
+class GetterOnMethodOnType {
+ private int test;
+ private String name;
+ @Deprecated
+ @java.lang.SuppressWarnings("all")
+ public int getTest() {
+ return this.test;
+ }
+ @Deprecated
+ @java.lang.SuppressWarnings("all")
+ public String getName() {
+ return this.name;
+ }
+}
diff --git a/test/transform/resource/after-delombok/InnerClass.java b/test/transform/resource/after-delombok/InnerClass.java
index 6d42bb79..2e49b9ad 100644
--- a/test/transform/resource/after-delombok/InnerClass.java
+++ b/test/transform/resource/after-delombok/InnerClass.java
@@ -1,3 +1,4 @@
+//version 8:
class A {
class B {
String s;
@@ -48,4 +49,4 @@ class C {
return "C.D(a=" + this.getA() + ")";
}
}
-} \ No newline at end of file
+}
diff --git a/test/transform/resource/after-delombok/LoggerFlogger.java b/test/transform/resource/after-delombok/LoggerFlogger.java
new file mode 100644
index 00000000..41d49fe4
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerFlogger.java
@@ -0,0 +1,14 @@
+class LoggerFlogger {
+ @java.lang.SuppressWarnings("all")
+ private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
+}
+class LoggerFloggerWithImport {
+ @java.lang.SuppressWarnings("all")
+ private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
+}
+class LoggerFloggerOuter {
+ static class Inner {
+ @java.lang.SuppressWarnings("all")
+ private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
+ }
+}
diff --git a/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java b/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java
new file mode 100644
index 00000000..b354a85d
--- /dev/null
+++ b/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java
@@ -0,0 +1,73 @@
+public class NoPrivateNoArgsConstructor {
+ public static class NoPrivateNoArgsConstructorData {
+ private final int i;
+ @java.lang.SuppressWarnings("all")
+ public NoPrivateNoArgsConstructorData(final int i) {
+ this.i = i;
+ }
+ @java.lang.SuppressWarnings("all")
+ public int getI() {
+ return this.i;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData)) return false;
+ final NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData other = (NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.getI() != other.getI()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.getI();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData(i=" + this.getI() + ")";
+ }
+ }
+ public static final class NoPrivateNoArgsConstructorValue {
+ private final int i;
+ @java.lang.SuppressWarnings("all")
+ public NoPrivateNoArgsConstructorValue(final int i) {
+ this.i = i;
+ }
+ @java.lang.SuppressWarnings("all")
+ public int getI() {
+ return this.i;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue)) return false;
+ final NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue other = (NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue) o;
+ if (this.getI() != other.getI()) return false;
+ return true;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.getI();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue(i=" + this.getI() + ")";
+ }
+ }
+} \ No newline at end of file
diff --git a/test/transform/resource/after-delombok/NonNullOnParameter.java b/test/transform/resource/after-delombok/NonNullOnParameter.java
index a27d19c9..fa06e41b 100644
--- a/test/transform/resource/after-delombok/NonNullOnParameter.java
+++ b/test/transform/resource/after-delombok/NonNullOnParameter.java
@@ -2,22 +2,22 @@ class NonNullOnParameter extends Thread {
NonNullOnParameter(@lombok.NonNull String arg) {
this(arg, "");
if (arg == null) {
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
}
NonNullOnParameter(@lombok.NonNull String arg, @lombok.NonNull String arg2) {
super(arg);
if (arg2 == null) {
- throw new java.lang.NullPointerException("arg2");
+ throw new java.lang.NullPointerException("arg2 is marked @NonNull but is null");
}
if (arg == null) throw new NullPointerException();
}
public void test2(@lombok.NonNull String arg, @lombok.NonNull String arg2, @lombok.NonNull String arg3) {
if (arg == null) {
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
if (arg3 == null) {
- throw new java.lang.NullPointerException("arg3");
+ throw new java.lang.NullPointerException("arg3 is marked @NonNull but is null");
}
if (arg2 == null) {
throw new NullPointerException("arg2");
@@ -26,21 +26,21 @@ class NonNullOnParameter extends Thread {
}
public void test3(@lombok.NonNull String arg) {
if (arg == null) {
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
if (arg != null) throw new IllegalStateException();
}
public void test(@lombok.NonNull String stringArg, @lombok.NonNull String arg2, @lombok.NonNull int primitiveArg) {
if (stringArg == null) {
- throw new java.lang.NullPointerException("stringArg");
+ throw new java.lang.NullPointerException("stringArg is marked @NonNull but is null");
}
if (arg2 == null) {
- throw new java.lang.NullPointerException("arg2");
+ throw new java.lang.NullPointerException("arg2 is marked @NonNull but is null");
}
}
public void test(@lombok.NonNull String arg) {
if (arg == null) {
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
System.out.println("Hey");
if (arg == null) throw new NullPointerException();
diff --git a/test/transform/resource/after-delombok/NonNullOnParameterAbstract.java b/test/transform/resource/after-delombok/NonNullOnParameterAbstract.java
index 62fd878a..a2dcb49c 100644
--- a/test/transform/resource/after-delombok/NonNullOnParameterAbstract.java
+++ b/test/transform/resource/after-delombok/NonNullOnParameterAbstract.java
@@ -1,7 +1,7 @@
abstract class NonNullOnParameterAbstract {
public void test(@lombok.NonNull String arg) {
if (arg == null) {
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
System.out.println("Hey");
}
diff --git a/test/transform/resource/after-delombok/NonNullOnParameterOfDefaultMethod.java b/test/transform/resource/after-delombok/NonNullOnParameterOfDefaultMethod.java
index e220296f..cf10253b 100644
--- a/test/transform/resource/after-delombok/NonNullOnParameterOfDefaultMethod.java
+++ b/test/transform/resource/after-delombok/NonNullOnParameterOfDefaultMethod.java
@@ -3,7 +3,7 @@ interface NonNullOnParameterOfDefaultMethod {
void test(@lombok.NonNull String arg);
default void test2(@lombok.NonNull String arg) {
if (arg == null) {
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
System.out.println(arg);
}
diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java
index f6b8037e..d3de3dcf 100644
--- a/test/transform/resource/after-delombok/NonNullPlain.java
+++ b/test/transform/resource/after-delombok/NonNullPlain.java
@@ -13,7 +13,7 @@ class NonNullPlain {
@java.lang.SuppressWarnings("all")
public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) {
if (s == null) {
- throw new java.lang.NullPointerException("s");
+ throw new java.lang.NullPointerException("s is marked @NonNull but is null");
}
this.i = i;
this.s = s;
@@ -39,7 +39,7 @@ class NonNullPlain {
@java.lang.SuppressWarnings("all")
public void setS(@lombok.NonNull final String s) {
if (s == null) {
- throw new java.lang.NullPointerException("s");
+ throw new java.lang.NullPointerException("s is marked @NonNull but is null");
}
this.s = s;
}
diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java
index 76c6406a..982da7d8 100644
--- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java
+++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java
@@ -3,14 +3,14 @@ public class NonNullWithAlternateException {
private String test;
public void testMethod(@lombok.NonNull String arg) {
if (arg == null) {
- throw new java.lang.IllegalArgumentException("arg is null");
+ throw new java.lang.IllegalArgumentException("arg is marked @NonNull but is null");
}
System.out.println(arg);
}
@java.lang.SuppressWarnings("all")
public void setTest(@lombok.NonNull final String test) {
if (test == null) {
- throw new java.lang.IllegalArgumentException("test is null");
+ throw new java.lang.IllegalArgumentException("test is marked @NonNull but is null");
}
this.test = test;
}
diff --git a/test/transform/resource/after-delombok/NonNullWithSneakyThrows.java b/test/transform/resource/after-delombok/NonNullWithSneakyThrows.java
index 97de0d8a..5000f16d 100644
--- a/test/transform/resource/after-delombok/NonNullWithSneakyThrows.java
+++ b/test/transform/resource/after-delombok/NonNullWithSneakyThrows.java
@@ -2,7 +2,7 @@ class NonNullWithSneakyThrows {
void test(@lombok.NonNull String in) {
try {
if (in == null) {
- throw new java.lang.NullPointerException("in");
+ throw new java.lang.NullPointerException("in is marked @NonNull but is null");
}
System.out.println(in);
} catch (final java.lang.Throwable $ex) {
diff --git a/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java b/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java
new file mode 100644
index 00000000..18e6f211
--- /dev/null
+++ b/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java
@@ -0,0 +1,236 @@
+public class PrivateNoArgsConstructor {
+ private static class Base {
+ }
+ public static class PrivateNoArgsConstructorNotOnExtends extends Base {
+ private final int a;
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorNotOnExtends(final int a) {
+ this.a = a;
+ }
+ @java.lang.SuppressWarnings("all")
+ public int getA() {
+ return this.a;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends)) return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (!super.equals(o)) return false;
+ if (this.getA() != other.getA()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = super.hashCode();
+ result = result * PRIME + this.getA();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends(a=" + this.getA() + ")";
+ }
+ }
+ public static class PrivateNoArgsConstructorOnExtendsObject extends Object {
+ private final int b;
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorOnExtendsObject(final int b) {
+ this.b = b;
+ }
+ @java.lang.SuppressWarnings("all")
+ private PrivateNoArgsConstructorOnExtendsObject() {
+ this.b = 0;
+ }
+ @java.lang.SuppressWarnings("all")
+ public int getB() {
+ return this.b;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject)) return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.getB() != other.getB()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.getB();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject(b=" + this.getB() + ")";
+ }
+ }
+ public static class PrivateNoArgsConstructorExplicitBefore {
+ private final int c;
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorExplicitBefore() {
+ this.c = 0;
+ }
+ @java.lang.SuppressWarnings("all")
+ public int getC() {
+ return this.c;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore)) return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.getC() != other.getC()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.getC();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore(c=" + this.getC() + ")";
+ }
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorExplicitBefore(final int c) {
+ this.c = c;
+ }
+ }
+ public static class PrivateNoArgsConstructorExplicitAfter {
+ private final int d;
+ @java.lang.SuppressWarnings("all")
+ public int getD() {
+ return this.d;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter)) return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.getD() != other.getD()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.getD();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter(d=" + this.getD() + ")";
+ }
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorExplicitAfter() {
+ this.d = 0;
+ }
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorExplicitAfter(final int d) {
+ this.d = d;
+ }
+ }
+ public static class PrivateNoArgsConstructorExplicitNone {
+ private final int e;
+ @java.lang.SuppressWarnings("all")
+ public int getE() {
+ return this.e;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone)) return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ if (this.getE() != other.getE()) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = result * PRIME + this.getE();
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone(e=" + this.getE() + ")";
+ }
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorExplicitNone(final int e) {
+ this.e = e;
+ }
+ }
+ public static class PrivateNoArgsConstructorNoFields {
+ @java.lang.SuppressWarnings("all")
+ public PrivateNoArgsConstructorNoFields() {
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields)) return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields) o;
+ if (!other.canEqual((java.lang.Object) this)) return false;
+ return true;
+ }
+ @java.lang.SuppressWarnings("all")
+ protected boolean canEqual(final java.lang.Object other) {
+ return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ int result = 1;
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields()";
+ }
+ }
+}
diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java
index f2347bcb..f880e20b 100644
--- a/test/transform/resource/after-delombok/SetterOnClass.java
+++ b/test/transform/resource/after-delombok/SetterOnClass.java
@@ -54,7 +54,7 @@ class SetterOnClass6 {
@java.lang.SuppressWarnings("all")
public void setNonNull(@lombok.NonNull final String nonNull) {
if (nonNull == null) {
- throw new java.lang.NullPointerException("nonNull");
+ throw new java.lang.NullPointerException("nonNull is marked @NonNull but is null");
}
this.nonNull = nonNull;
}
diff --git a/test/transform/resource/after-delombok/ToStringNewStyle.java b/test/transform/resource/after-delombok/ToStringNewStyle.java
new file mode 100644
index 00000000..0a54bd24
--- /dev/null
+++ b/test/transform/resource/after-delombok/ToStringNewStyle.java
@@ -0,0 +1,18 @@
+public class ToStringNewStyle {
+ int b;
+ double c;
+ int f;
+ int d;
+ int f() {
+ return 0;
+ }
+ int g;
+ int h;
+ int i;
+ int j;
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "ToStringNewStyle(a=" + this.b + ", c=" + this.c + ", e=" + this.d + ", f=" + this.f() + ", g=" + this.g + ", i=" + this.i + ", h=" + this.h + ")";
+ }
+}
diff --git a/test/transform/resource/after-delombok/WitherOnClass.java b/test/transform/resource/after-delombok/WitherOnClass.java
index 45d0c4b5..93309c89 100644
--- a/test/transform/resource/after-delombok/WitherOnClass.java
+++ b/test/transform/resource/after-delombok/WitherOnClass.java
@@ -36,7 +36,7 @@ class WitherOnClass3 {
@java.lang.SuppressWarnings("all")
public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) {
if (nonNull == null) {
- throw new java.lang.NullPointerException("nonNull");
+ throw new java.lang.NullPointerException("nonNull is marked @NonNull but is null");
}
return this.nonNull == nonNull ? this : new WitherOnClass3(this.couldBeNull, nonNull);
}
diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
index 301e6132..6050ab9f 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
@@ -20,19 +20,19 @@
super();
if ((plower == null))
{
- throw new java.lang.NullPointerException("plower");
+ throw new java.lang.NullPointerException("plower is marked @NonNull but is null");
}
if ((upper == null))
{
- throw new java.lang.NullPointerException("upper");
+ throw new java.lang.NullPointerException("upper is marked @NonNull but is null");
}
if ((huh == null))
{
- throw new java.lang.NullPointerException("huh");
+ throw new java.lang.NullPointerException("huh is marked @NonNull but is null");
}
if ((_huh2 == null))
{
- throw new java.lang.NullPointerException("_huh2");
+ throw new java.lang.NullPointerException("_huh2 is marked @NonNull but is null");
}
this.plower = plower;
this.pUpper = upper;
diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java
index 1e7adfbf..25f7620e 100644
--- a/test/transform/resource/after-ecj/DataConfiguration.java
+++ b/test/transform/resource/after-ecj/DataConfiguration.java
@@ -31,4 +31,8 @@
super();
this.x = x;
}
+ private @java.lang.SuppressWarnings("all") DataConfiguration() {
+ super();
+ this.x = 0;
+ }
}
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 341df49b..ff2a3d20 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -64,7 +64,7 @@ class DataOnLocalClass2 {
public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) {
if ((name == null))
{
- throw new java.lang.NullPointerException("name");
+ throw new java.lang.NullPointerException("name is marked @NonNull but is null");
}
this.name = name;
}
@@ -99,7 +99,7 @@ class DataOnLocalClass2 {
super();
if ((name == null))
{
- throw new java.lang.NullPointerException("name");
+ throw new java.lang.NullPointerException("name is marked @NonNull but is null");
}
this.name = name;
}
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java b/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java
new file mode 100644
index 00000000..7fbe6d24
--- /dev/null
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java
@@ -0,0 +1,53 @@
+import lombok.EqualsAndHashCode;
+public @EqualsAndHashCode class EqualsAndHashCodeNewStyle {
+ @EqualsAndHashCode.Include int b;
+ double c;
+ int f;
+ @EqualsAndHashCode.Include int d;
+ int g;
+ @EqualsAndHashCode.Exclude int j;
+ public EqualsAndHashCodeNewStyle() {
+ super();
+ }
+ @EqualsAndHashCode.Include int f() {
+ return 0;
+ }
+ @EqualsAndHashCode.Include(replaces = "g") long i() {
+ return 0;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof EqualsAndHashCodeNewStyle)))
+ return false;
+ final EqualsAndHashCodeNewStyle other = (EqualsAndHashCodeNewStyle) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.b != other.b))
+ return false;
+ if ((java.lang.Double.compare(this.c, other.c) != 0))
+ return false;
+ if ((this.d != other.d))
+ return false;
+ if ((this.f() != other.f()))
+ return false;
+ if ((this.i() != other.i()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof EqualsAndHashCodeNewStyle);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.b);
+ final long $c = java.lang.Double.doubleToLongBits(this.c);
+ result = ((result * PRIME) + (int) ($c ^ ($c >>> 32)));
+ result = ((result * PRIME) + this.d);
+ result = ((result * PRIME) + this.f());
+ final long $$i = this.i();
+ result = ((result * PRIME) + (int) ($$i ^ ($$i >>> 32)));
+ return result;
+ }
+}
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java
new file mode 100644
index 00000000..8c849502
--- /dev/null
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java
@@ -0,0 +1,30 @@
+public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces<A> {
+ @lombok.EqualsAndHashCode class Inner<B> {
+ int x;
+ Inner() {
+ super();
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner)))
+ return false;
+ final EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner<?> other = (EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner<?>) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.x != other.x))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.x);
+ return result;
+ }
+ }
+}
+
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java
new file mode 100644
index 00000000..f77203ba
--- /dev/null
+++ b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java
@@ -0,0 +1,15 @@
+import lombok.experimental.FieldNameConstants;
+import lombok.AccessLevel;
+public @FieldNameConstants class FieldNameConstantsBasic {
+ public static final java.lang.String FIELD_BUT_PRINT_ME_PLEASE = "butPrintMePlease";
+ protected static final java.lang.String FIELD_I_AM_A_DVD_PLAYER = "iAmADvdPlayer";
+ @FieldNameConstants(level = AccessLevel.PROTECTED) String iAmADvdPlayer;
+ int $skipMe;
+ static double skipMeToo;
+ String butPrintMePlease;
+ <clinit>() {
+ }
+ public FieldNameConstantsBasic() {
+ super();
+ }
+}
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java
new file mode 100644
index 00000000..44629ee5
--- /dev/null
+++ b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java
@@ -0,0 +1,9 @@
+public @lombok.experimental.FieldNameConstants class FieldNameConstantsConfigKeys {
+ public static final java.lang.String I_AM_A_DVD_PLAYER_SFX = "iAmADvdPlayer";
+ String iAmADvdPlayer;
+ <clinit>() {
+ }
+ public FieldNameConstantsConfigKeys() {
+ super();
+ }
+}
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsWeird.java b/test/transform/resource/after-ecj/FieldNameConstantsWeird.java
new file mode 100644
index 00000000..9958f664
--- /dev/null
+++ b/test/transform/resource/after-ecj/FieldNameConstantsWeird.java
@@ -0,0 +1,13 @@
+import lombok.experimental.FieldNameConstants;
+import lombok.AccessLevel;
+public @FieldNameConstants class FieldNameConstantsWeird {
+ public static final java.lang.String FIELD_AZ = "A";
+ @FieldNameConstants(level = AccessLevel.NONE) String iAmADvdPlayer;
+ @FieldNameConstants(prefix = "") String X;
+ @FieldNameConstants(suffix = "Z") String A;
+ <clinit>() {
+ }
+ public FieldNameConstantsWeird() {
+ super();
+ }
+}
diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors.java b/test/transform/resource/after-ecj/GetterOnMethodErrors.java
deleted file mode 100644
index 16c625b5..00000000
--- a/test/transform/resource/after-ecj/GetterOnMethodErrors.java
+++ /dev/null
@@ -1,14 +0,0 @@
-class PlaceFillerToMakeSurePositionIsRelevant {
- PlaceFillerToMakeSurePositionIsRelevant() {
- super();
- }
-}
-@lombok.Getter() class GetterOnMethodErrors {
- private int test;
- GetterOnMethodErrors() {
- super();
- }
- public @java.lang.SuppressWarnings("all") int getTest() {
- return this.test;
- }
-} \ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterOnMethodOnType.java b/test/transform/resource/after-ecj/GetterOnMethodOnType.java
new file mode 100644
index 00000000..2b39abf2
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterOnMethodOnType.java
@@ -0,0 +1,13 @@
+@lombok.Getter() class GetterOnMethodOnType {
+ private int test;
+ private String name;
+ GetterOnMethodOnType() {
+ super();
+ }
+ public @Deprecated @java.lang.SuppressWarnings("all") int getTest() {
+ return this.test;
+ }
+ public @Deprecated @java.lang.SuppressWarnings("all") String getName() {
+ return this.name;
+ }
+} \ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerFlogger.java b/test/transform/resource/after-ecj/LoggerFlogger.java
new file mode 100644
index 00000000..d0526eee
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerFlogger.java
@@ -0,0 +1,30 @@
+import lombok.extern.flogger.Flogger;
+@lombok.extern.flogger.Flogger class LoggerFlogger {
+ private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
+ <clinit>() {
+ }
+ LoggerFlogger() {
+ super();
+ }
+}
+@Flogger class LoggerFloggerWithImport {
+ private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
+ <clinit>() {
+ }
+ LoggerFloggerWithImport() {
+ super();
+ }
+}
+class LoggerFloggerOuter {
+ static @lombok.extern.flogger.Flogger class Inner {
+ private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
+ <clinit>() {
+ }
+ Inner() {
+ super();
+ }
+ }
+ LoggerFloggerOuter() {
+ super();
+ }
+}
diff --git a/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java b/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java
new file mode 100644
index 00000000..a2bfe3bd
--- /dev/null
+++ b/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java
@@ -0,0 +1,68 @@
+public class NoPrivateNoArgsConstructor {
+ public static @lombok.Data class NoPrivateNoArgsConstructorData {
+ private final int i;
+ public @java.lang.SuppressWarnings("all") int getI() {
+ return this.i;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData)))
+ return false;
+ final NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData other = (NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.getI() != other.getI()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.getI());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData(i=" + this.getI()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") NoPrivateNoArgsConstructorData(final int i) {
+ super();
+ this.i = i;
+ }
+ }
+ public static final @lombok.Value class NoPrivateNoArgsConstructorValue {
+ private final int i;
+ public @java.lang.SuppressWarnings("all") int getI() {
+ return this.i;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue)))
+ return false;
+ final NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue other = (NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue) o;
+ if ((this.getI() != other.getI()))
+ return false;
+ return true;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.getI());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue(i=" + this.getI()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") NoPrivateNoArgsConstructorValue(final int i) {
+ super();
+ this.i = i;
+ }
+ }
+ public NoPrivateNoArgsConstructor() {
+ super();
+ }
+} \ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NonNullOnParameter.java b/test/transform/resource/after-ecj/NonNullOnParameter.java
index bbceb153..fde47e1d 100644
--- a/test/transform/resource/after-ecj/NonNullOnParameter.java
+++ b/test/transform/resource/after-ecj/NonNullOnParameter.java
@@ -3,14 +3,14 @@ class NonNullOnParameter extends Thread {
this(arg, "");
if ((arg == null))
{
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
}
NonNullOnParameter(@lombok.NonNull String arg, @lombok.NonNull String arg2) {
super(arg);
if ((arg2 == null))
{
- throw new java.lang.NullPointerException("arg2");
+ throw new java.lang.NullPointerException("arg2 is marked @NonNull but is null");
}
if ((arg == null))
throw new NullPointerException();
@@ -18,11 +18,11 @@ class NonNullOnParameter extends Thread {
public void test2(@lombok.NonNull String arg, @lombok.NonNull String arg2, @lombok.NonNull String arg3) {
if ((arg == null))
{
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
if ((arg3 == null))
{
- throw new java.lang.NullPointerException("arg3");
+ throw new java.lang.NullPointerException("arg3 is marked @NonNull but is null");
}
if ((arg2 == null))
{
@@ -34,7 +34,7 @@ class NonNullOnParameter extends Thread {
public void test3(@lombok.NonNull String arg) {
if ((arg == null))
{
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
if ((arg != null))
throw new IllegalStateException();
@@ -42,17 +42,17 @@ class NonNullOnParameter extends Thread {
public void test(@lombok.NonNull String stringArg, @lombok.NonNull String arg2, @lombok.NonNull int primitiveArg) {
if ((stringArg == null))
{
- throw new java.lang.NullPointerException("stringArg");
+ throw new java.lang.NullPointerException("stringArg is marked @NonNull but is null");
}
if ((arg2 == null))
{
- throw new java.lang.NullPointerException("arg2");
+ throw new java.lang.NullPointerException("arg2 is marked @NonNull but is null");
}
}
public void test(@lombok.NonNull String arg) {
if ((arg == null))
{
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
System.out.println("Hey");
if ((arg == null))
diff --git a/test/transform/resource/after-ecj/NonNullOnParameterAbstract.java b/test/transform/resource/after-ecj/NonNullOnParameterAbstract.java
index a7dae247..d3e1fdd6 100644
--- a/test/transform/resource/after-ecj/NonNullOnParameterAbstract.java
+++ b/test/transform/resource/after-ecj/NonNullOnParameterAbstract.java
@@ -5,7 +5,7 @@ abstract class NonNullOnParameterAbstract {
public void test(@lombok.NonNull String arg) {
if ((arg == null))
{
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
System.out.println("Hey");
}
diff --git a/test/transform/resource/after-ecj/NonNullOnParameterOfDefaultMethod.java b/test/transform/resource/after-ecj/NonNullOnParameterOfDefaultMethod.java
index 85e99702..7293bcf5 100644
--- a/test/transform/resource/after-ecj/NonNullOnParameterOfDefaultMethod.java
+++ b/test/transform/resource/after-ecj/NonNullOnParameterOfDefaultMethod.java
@@ -3,7 +3,7 @@ interface NonNullOnParameterOfDefaultMethod {
default void test2(@lombok.NonNull String arg) {
if ((arg == null))
{
- throw new java.lang.NullPointerException("arg");
+ throw new java.lang.NullPointerException("arg is marked @NonNull but is null");
}
System.out.println(arg);
}
diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java
index 9edb576b..c703f38a 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -9,7 +9,7 @@ import java.lang.annotation.*;
super();
if ((s == null))
{
- throw new java.lang.NullPointerException("s");
+ throw new java.lang.NullPointerException("s is marked @NonNull but is null");
}
this.i = i;
this.s = s;
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) {
if ((s == null))
{
- throw new java.lang.NullPointerException("s");
+ throw new java.lang.NullPointerException("s is marked @NonNull but is null");
}
this.s = s;
}
diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java
index 8a547ecf..39e9c0a8 100644
--- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java
+++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java
@@ -6,14 +6,14 @@ public class NonNullWithAlternateException {
public void testMethod(@lombok.NonNull String arg) {
if ((arg == null))
{
- throw new java.lang.IllegalArgumentException("arg is null");
+ throw new java.lang.IllegalArgumentException("arg is marked @NonNull but is null");
}
System.out.println(arg);
}
public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) {
if ((test == null))
{
- throw new java.lang.IllegalArgumentException("test is null");
+ throw new java.lang.IllegalArgumentException("test is marked @NonNull but is null");
}
this.test = test;
}
diff --git a/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java b/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java
index 1a57be29..22799b5e 100644
--- a/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java
+++ b/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java
@@ -7,7 +7,7 @@ class NonNullWithSneakyThrows {
{
if ((in == null))
{
- throw new java.lang.NullPointerException("in");
+ throw new java.lang.NullPointerException("in is marked @NonNull but is null");
}
System.out.println(in);
}
diff --git a/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java b/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java
new file mode 100644
index 00000000..f746ec9a
--- /dev/null
+++ b/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java
@@ -0,0 +1,219 @@
+public class PrivateNoArgsConstructor {
+ private static class Base {
+ private Base() {
+ super();
+ }
+ }
+ public static @lombok.Data class PrivateNoArgsConstructorNotOnExtends extends Base {
+ private final int a;
+ public @java.lang.SuppressWarnings("all") int getA() {
+ return this.a;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends)))
+ return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((! super.equals(o)))
+ return false;
+ if ((this.getA() != other.getA()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = super.hashCode();
+ result = ((result * PRIME) + this.getA());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends(a=" + this.getA()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorNotOnExtends(final int a) {
+ super();
+ this.a = a;
+ }
+ }
+ public static @lombok.Data class PrivateNoArgsConstructorOnExtendsObject extends Object {
+ private final int b;
+ public @java.lang.SuppressWarnings("all") int getB() {
+ return this.b;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject)))
+ return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.getB() != other.getB()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.getB());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject(b=" + this.getB()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorOnExtendsObject(final int b) {
+ super();
+ this.b = b;
+ }
+ private @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorOnExtendsObject() {
+ super();
+ this.b = 0;
+ }
+ }
+ public static @lombok.NoArgsConstructor(force = true) @lombok.Data @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitBefore {
+ private final int c;
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitBefore() {
+ super();
+ this.c = 0;
+ }
+ public @java.lang.SuppressWarnings("all") int getC() {
+ return this.c;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore)))
+ return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.getC() != other.getC()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.getC());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore(c=" + this.getC()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitBefore(final int c) {
+ super();
+ this.c = c;
+ }
+ }
+ public static @lombok.Data @lombok.NoArgsConstructor(force = true) @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitAfter {
+ private final int d;
+ public @java.lang.SuppressWarnings("all") int getD() {
+ return this.d;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter)))
+ return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.getD() != other.getD()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.getD());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter(d=" + this.getD()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitAfter() {
+ super();
+ this.d = 0;
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitAfter(final int d) {
+ super();
+ this.d = d;
+ }
+ }
+ public static @lombok.Data @lombok.NoArgsConstructor(access = lombok.AccessLevel.NONE) @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitNone {
+ private final int e;
+ public @java.lang.SuppressWarnings("all") int getE() {
+ return this.e;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone)))
+ return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((this.getE() != other.getE()))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + this.getE());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone(e=" + this.getE()) + ")");
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitNone(final int e) {
+ super();
+ this.e = e;
+ }
+ }
+ public static @lombok.Data class PrivateNoArgsConstructorNoFields {
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields)))
+ return false;
+ final PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields other = (PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+ return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ int result = 1;
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields()";
+ }
+ public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorNoFields() {
+ super();
+ }
+ }
+ public PrivateNoArgsConstructor() {
+ super();
+ }
+}
diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java
index aa3459bb..c7aec900 100644
--- a/test/transform/resource/after-ecj/SetterOnClass.java
+++ b/test/transform/resource/after-ecj/SetterOnClass.java
@@ -64,7 +64,7 @@
public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) {
if ((nonNull == null))
{
- throw new java.lang.NullPointerException("nonNull");
+ throw new java.lang.NullPointerException("nonNull is marked @NonNull but is null");
}
this.nonNull = nonNull;
}
diff --git a/test/transform/resource/after-ecj/ToStringNewStyle.java b/test/transform/resource/after-ecj/ToStringNewStyle.java
new file mode 100644
index 00000000..cdc6f5bc
--- /dev/null
+++ b/test/transform/resource/after-ecj/ToStringNewStyle.java
@@ -0,0 +1,20 @@
+import lombok.ToString;
+public @ToString class ToStringNewStyle {
+ @ToString.Include(name = "a") int b;
+ double c;
+ int f;
+ @ToString.Include(name = "e") int d;
+ int g;
+ @ToString.Include(rank = (- 1)) int h;
+ int i;
+ @ToString.Exclude int j;
+ public ToStringNewStyle() {
+ super();
+ }
+ @ToString.Include int f() {
+ return 0;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (((((((((((((("ToStringNewStyle(a=" + this.b) + ", c=") + this.c) + ", e=") + this.d) + ", f=") + this.f()) + ", g=") + this.g) + ", i=") + this.i) + ", h=") + this.h) + ")");
+ }
+}
diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java
index 82132e87..086ba591 100644
--- a/test/transform/resource/after-ecj/WitherOnClass.java
+++ b/test/transform/resource/after-ecj/WitherOnClass.java
@@ -34,7 +34,7 @@
public @java.lang.SuppressWarnings("all") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
if ((nonNull == null))
{
- throw new java.lang.NullPointerException("nonNull");
+ throw new java.lang.NullPointerException("nonNull is marked @NonNull but is null");
}
return ((this.nonNull == nonNull) ? this : new WitherOnClass3(this.couldBeNull, nonNull));
}
diff --git a/test/transform/resource/before/BuilderWithRecursiveGenerics.java b/test/transform/resource/before/BuilderWithRecursiveGenerics.java
index 041da414..0ab86220 100644
--- a/test/transform/resource/before/BuilderWithRecursiveGenerics.java
+++ b/test/transform/resource/before/BuilderWithRecursiveGenerics.java
@@ -5,7 +5,7 @@ import lombok.Value;
public class BuilderWithRecursiveGenerics {
interface Inter<T, U extends Inter<T, U>> {}
-
+
@Builder @Value public static class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
Foo foo;
Bar bar;
diff --git a/test/transform/resource/before/DataConfiguration.java b/test/transform/resource/before/DataConfiguration.java
index 8b9657f9..9e0bd420 100644
--- a/test/transform/resource/before/DataConfiguration.java
+++ b/test/transform/resource/before/DataConfiguration.java
@@ -1,6 +1,7 @@
//CONF: lombok.anyConstructor.suppressConstructorProperties = true
//CONF: lombok.toString.doNotUseGetters = true
//CONF: lombok.equalsAndHashCode.doNotUseGetters = true
+//CONF: lombok.noArgsConstructor.extraPrivate = true
@lombok.Data
class DataConfiguration {
final int x;
diff --git a/test/transform/resource/before/EqualsAndHashCodeNewStyle.java b/test/transform/resource/before/EqualsAndHashCodeNewStyle.java
new file mode 100644
index 00000000..0665d120
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeNewStyle.java
@@ -0,0 +1,16 @@
+import lombok.EqualsAndHashCode;
+@EqualsAndHashCode
+public class EqualsAndHashCodeNewStyle {
+ @EqualsAndHashCode.Include int b;
+ double c;
+ int f;
+ @EqualsAndHashCode.Include int d;
+ @EqualsAndHashCode.Include int f() {
+ return 0;
+ }
+ int g;
+ @EqualsAndHashCode.Include(replaces = "g") long i() {
+ return 0;
+ }
+ @EqualsAndHashCode.Exclude int j;
+}
diff --git a/test/transform/resource/before/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/before/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java
new file mode 100644
index 00000000..585ebbde
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java
@@ -0,0 +1,6 @@
+public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces<A> {
+ @lombok.EqualsAndHashCode class Inner<B> {
+ int x;
+ }
+}
+
diff --git a/test/transform/resource/before/FieldNameConstantsBasic.java b/test/transform/resource/before/FieldNameConstantsBasic.java
new file mode 100644
index 00000000..1bc15d84
--- /dev/null
+++ b/test/transform/resource/before/FieldNameConstantsBasic.java
@@ -0,0 +1,11 @@
+import lombok.experimental.FieldNameConstants;
+import lombok.AccessLevel;
+
+@FieldNameConstants
+public class FieldNameConstantsBasic {
+ @FieldNameConstants(level = AccessLevel.PROTECTED)
+ String iAmADvdPlayer;
+ int $skipMe;
+ static double skipMeToo;
+ String butPrintMePlease;
+}
diff --git a/test/transform/resource/before/FieldNameConstantsConfigKeys.java b/test/transform/resource/before/FieldNameConstantsConfigKeys.java
new file mode 100644
index 00000000..ab8e3091
--- /dev/null
+++ b/test/transform/resource/before/FieldNameConstantsConfigKeys.java
@@ -0,0 +1,7 @@
+//CONF: lombok.fieldNameConstants.prefix =
+//CONF: lombok.fieldNameConstants.suffix = _SFX
+
+@lombok.experimental.FieldNameConstants
+public class FieldNameConstantsConfigKeys {
+ String iAmADvdPlayer;
+}
diff --git a/test/transform/resource/before/FieldNameConstantsWeird.java b/test/transform/resource/before/FieldNameConstantsWeird.java
new file mode 100644
index 00000000..74ec299a
--- /dev/null
+++ b/test/transform/resource/before/FieldNameConstantsWeird.java
@@ -0,0 +1,12 @@
+import lombok.experimental.FieldNameConstants;
+import lombok.AccessLevel;
+
+@FieldNameConstants
+public class FieldNameConstantsWeird {
+ @FieldNameConstants(level = AccessLevel.NONE)
+ String iAmADvdPlayer;
+ @FieldNameConstants(prefix = "")
+ String X;
+ @FieldNameConstants(suffix = "Z")
+ String A;
+}
diff --git a/test/transform/resource/before/GetterOnMethodErrors.java b/test/transform/resource/before/GetterOnMethodErrors.java
deleted file mode 100644
index ec4704f0..00000000
--- a/test/transform/resource/before/GetterOnMethodErrors.java
+++ /dev/null
@@ -1,6 +0,0 @@
-class PlaceFillerToMakeSurePositionIsRelevant {
-}
-@lombok.Getter(onMethod=@__(@Deprecated))
-class GetterOnMethodErrors {
- private int test;
-}
diff --git a/test/transform/resource/before/GetterOnMethodOnType.java b/test/transform/resource/before/GetterOnMethodOnType.java
new file mode 100644
index 00000000..296ebcc4
--- /dev/null
+++ b/test/transform/resource/before/GetterOnMethodOnType.java
@@ -0,0 +1,5 @@
+@lombok.Getter(onMethod=@__(@Deprecated))
+class GetterOnMethodOnType {
+ private int test;
+ private String name;
+}
diff --git a/test/transform/resource/before/LoggerFlogger.java b/test/transform/resource/before/LoggerFlogger.java
new file mode 100644
index 00000000..b143aae9
--- /dev/null
+++ b/test/transform/resource/before/LoggerFlogger.java
@@ -0,0 +1,16 @@
+import lombok.extern.flogger.Flogger;
+
+@lombok.extern.flogger.Flogger
+class LoggerFlogger {
+}
+
+@Flogger
+class LoggerFloggerWithImport {
+}
+
+class LoggerFloggerOuter {
+ @lombok.extern.flogger.Flogger
+ static class Inner {
+
+ }
+}
diff --git a/test/transform/resource/before/NoPrivateNoArgsConstructor.java b/test/transform/resource/before/NoPrivateNoArgsConstructor.java
new file mode 100644
index 00000000..b7c2a616
--- /dev/null
+++ b/test/transform/resource/before/NoPrivateNoArgsConstructor.java
@@ -0,0 +1,12 @@
+//CONF: lombok.noArgsConstructor.extraPrivate = false
+public class NoPrivateNoArgsConstructor {
+ @lombok.Data
+ public static class NoPrivateNoArgsConstructorData {
+ private final int i;
+ }
+
+ @lombok.Value
+ public static class NoPrivateNoArgsConstructorValue {
+ int i;
+ }
+}
diff --git a/test/transform/resource/before/PrivateNoArgsConstructor.java b/test/transform/resource/before/PrivateNoArgsConstructor.java
new file mode 100644
index 00000000..38f5aed0
--- /dev/null
+++ b/test/transform/resource/before/PrivateNoArgsConstructor.java
@@ -0,0 +1,41 @@
+// CONF: lombok.noArgsConstructor.extraPrivate = true
+// CONF: lombok.equalsAndHashCode.callSuper = call
+public class PrivateNoArgsConstructor {
+ private static class Base {
+ }
+
+ @lombok.Data
+ public static class PrivateNoArgsConstructorNotOnExtends extends Base {
+ private final int a;
+ }
+
+ @lombok.Data
+ public static class PrivateNoArgsConstructorOnExtendsObject extends Object {
+ private final int b;
+ }
+
+ @lombok.NoArgsConstructor(force=true)
+ @lombok.Data
+ @lombok.RequiredArgsConstructor
+ public static class PrivateNoArgsConstructorExplicitBefore {
+ private final int c;
+ }
+
+ @lombok.Data
+ @lombok.NoArgsConstructor(force=true)
+ @lombok.RequiredArgsConstructor
+ public static class PrivateNoArgsConstructorExplicitAfter {
+ private final int d;
+ }
+
+ @lombok.Data
+ @lombok.NoArgsConstructor(access=lombok.AccessLevel.NONE)
+ @lombok.RequiredArgsConstructor
+ public static class PrivateNoArgsConstructorExplicitNone {
+ private final int e;
+ }
+
+ @lombok.Data
+ public static class PrivateNoArgsConstructorNoFields {
+ }
+}
diff --git a/test/transform/resource/before/ToStringNewStyle.java b/test/transform/resource/before/ToStringNewStyle.java
new file mode 100644
index 00000000..7e436e51
--- /dev/null
+++ b/test/transform/resource/before/ToStringNewStyle.java
@@ -0,0 +1,15 @@
+import lombok.ToString;
+@ToString
+public class ToStringNewStyle {
+ @ToString.Include(name = "a") int b;
+ double c;
+ int f;
+ @ToString.Include(name = "e") int d;
+ @ToString.Include int f() {
+ return 0;
+ }
+ int g;
+ @ToString.Include(rank = -1) int h;
+ int i;
+ @ToString.Exclude int j;
+}
diff --git a/test/transform/resource/before/ToStringWithConstantRefInOf.java b/test/transform/resource/before/ToStringWithConstantRefInOf.java
new file mode 100644
index 00000000..6246dcaf
--- /dev/null
+++ b/test/transform/resource/before/ToStringWithConstantRefInOf.java
@@ -0,0 +1,10 @@
+//skip compare contents
+import lombok.ToString;
+
+@ToString(of = ToStringWithConstantRefInOf.FIELD_NAME)
+public class ToStringWithConstantRefInOf {
+ static final String FIELD_NAME = "id";
+ private String id;
+ private int whatever;
+}
+
diff --git a/test/transform/resource/messages-delombok/FieldNameConstantsWeird.java.messages b/test/transform/resource/messages-delombok/FieldNameConstantsWeird.java.messages
new file mode 100644
index 00000000..02a38d58
--- /dev/null
+++ b/test/transform/resource/messages-delombok/FieldNameConstantsWeird.java.messages
@@ -0,0 +1 @@
+9 Not generating constant for this field: The name of the constant would be equal to the name of this field.
diff --git a/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages b/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages
deleted file mode 100644
index 26c30298..00000000
--- a/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-3 'onMethod' is not supported for @Getter on a type. \ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/ToStringWithConstantRefInOf.java.messages b/test/transform/resource/messages-delombok/ToStringWithConstantRefInOf.java.messages
new file mode 100644
index 00000000..d88e2754
--- /dev/null
+++ b/test/transform/resource/messages-delombok/ToStringWithConstantRefInOf.java.messages
@@ -0,0 +1 @@
+4 You must use constant literals in lombok annotations; they cannot be references to (static) fields.
diff --git a/test/transform/resource/messages-ecj/FieldNameConstantsWeird.java.messages b/test/transform/resource/messages-ecj/FieldNameConstantsWeird.java.messages
new file mode 100644
index 00000000..02a38d58
--- /dev/null
+++ b/test/transform/resource/messages-ecj/FieldNameConstantsWeird.java.messages
@@ -0,0 +1 @@
+9 Not generating constant for this field: The name of the constant would be equal to the name of this field.
diff --git a/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages b/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages
deleted file mode 100644
index 26c30298..00000000
--- a/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-3 'onMethod' is not supported for @Getter on a type. \ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/ToStringWithConstantRefInOf.java.messages b/test/transform/resource/messages-ecj/ToStringWithConstantRefInOf.java.messages
new file mode 100644
index 00000000..d88e2754
--- /dev/null
+++ b/test/transform/resource/messages-ecj/ToStringWithConstantRefInOf.java.messages
@@ -0,0 +1 @@
+4 You must use constant literals in lombok annotations; they cannot be references to (static) fields.