Fixed unit tests to take into account work on issue 289 and 287.

22 files changed, 53 insertions, 67 deletions

diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index ad174b93..af5c12a5 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -77,7 +77,7 @@ class DataOnLocalClass2 {
 				@java.lang.SuppressWarnings("all")
 				public boolean equals(final java.lang.Object o) {
 					if (o == this) return true;
-					if (!(o instanceof InnerLocal)) return false;
+					if (!(o instanceof Local.InnerLocal)) return false;
 					final InnerLocal other = (InnerLocal)o;
 					if (!other.canEqual((java.lang.Object)this)) return false;
 					if (this.getName() == null ? other.getName() != null : !this.getName().equals((java.lang.Object)other.getName())) return false;
@@ -85,7 +85,7 @@ class DataOnLocalClass2 {
 				}
 				@java.lang.SuppressWarnings("all")
 				public boolean canEqual(final java.lang.Object other) {
-					return other instanceof InnerLocal;
+					return other instanceof Local.InnerLocal;
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java
index 17c9ab51..064e00b9 100644
--- a/test/transform/resource/after-delombok/NonNullPlain.java
+++ b/test/transform/resource/after-delombok/NonNullPlain.java
@@ -13,14 +13,12 @@ class NonNullPlain {
 	public @interface NotNull {
 	}
 	
-	@java.beans.ConstructorProperties({"i", "s", "o"})
+	@java.beans.ConstructorProperties({"i", "s"})
 	@java.lang.SuppressWarnings("all")
-	public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s, @NotNull final Object o) {
+	public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) {
 		if (s == null) throw new java.lang.NullPointerException("s");
-		if (o == null) throw new java.lang.NullPointerException("o");
 		this.i = i;
 		this.s = s;
-		this.o = o;
 	}
 	
 	@lombok.NonNull
@@ -35,7 +33,6 @@ class NonNullPlain {
 		return this.s;
 	}
 	
-	@NotNull
 	@java.lang.SuppressWarnings("all")
 	public Object getO() {
 		return this.o;
@@ -53,8 +50,7 @@ class NonNullPlain {
 	}
 	
 	@java.lang.SuppressWarnings("all")
-	public void setO(@NotNull final Object o) {
-		if (o == null) throw new java.lang.NullPointerException("o");
+	public void setO(final Object o) {
 		this.o = o;
 	}
 }
diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java
index 924fe8da..dfc64f2d 100644
--- a/test/transform/resource/after-ecj/DataExtended.java
+++ b/test/transform/resource/after-ecj/DataExtended.java
@@ -14,7 +14,7 @@
         return true;
     if ((! (o instanceof DataExtended)))
         return false;
-    final DataExtended other = (DataExtended) o;
+    final @java.lang.SuppressWarnings("all") DataExtended other = (DataExtended) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java
index fb700ee2..109bf1d6 100644
--- a/test/transform/resource/after-ecj/DataIgnore.java
+++ b/test/transform/resource/after-ecj/DataIgnore.java
@@ -13,7 +13,7 @@
         return true;
     if ((! (o instanceof DataIgnore)))
         return false;
-    final DataIgnore other = (DataIgnore) o;
+    final @java.lang.SuppressWarnings("all") DataIgnore other = (DataIgnore) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 6c85fae7..44ae0ddc 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -25,7 +25,7 @@ class DataOnLocalClass1 {
             return true;
         if ((! (o instanceof Local)))
             return false;
-        final Local other = (Local) o;
+        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
         if ((! other.canEqual((java.lang.Object) this)))
             return false;
         if ((this.getX() != other.getX()))
@@ -72,9 +72,9 @@ class DataOnLocalClass2 {
         public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
           if ((o == this))
               return true;
-          if ((! (o instanceof InnerLocal)))
+          if ((! (o instanceof Local.InnerLocal)))
               return false;
-          final InnerLocal other = (InnerLocal) o;
+          final @java.lang.SuppressWarnings("all") InnerLocal other = (InnerLocal) o;
           if ((! other.canEqual((java.lang.Object) this)))
               return false;
           if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -82,7 +82,7 @@ class DataOnLocalClass2 {
           return true;
         }
         public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-          return (other instanceof InnerLocal);
+          return (other instanceof Local.InnerLocal);
         }
         public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
           final int PRIME = 31;
@@ -107,7 +107,7 @@ class DataOnLocalClass2 {
             return true;
         if ((! (o instanceof Local)))
             return false;
-        final Local other = (Local) o;
+        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
         if ((! other.canEqual((java.lang.Object) this)))
             return false;
         if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index 0edf164b..0c4a6ab0 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -20,7 +20,7 @@ import lombok.Data;
         return true;
     if ((! (o instanceof Data1)))
         return false;
-    final Data1 other = (Data1) o;
+    final @java.lang.SuppressWarnings("all") Data1 other = (Data1) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -64,7 +64,7 @@ import lombok.Data;
         return true;
     if ((! (o instanceof Data2)))
         return false;
-    final Data2 other = (Data2) o;
+    final @java.lang.SuppressWarnings("all") Data2 other = (Data2) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -108,7 +108,7 @@ final @Data class Data3 {
         return true;
     if ((! (o instanceof Data3)))
         return false;
-    final Data3 other = (Data3) o;
+    final @java.lang.SuppressWarnings("all") Data3 other = (Data3) o;
     if ((this.getX() != other.getX()))
         return false;
     if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -139,7 +139,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return true;
     if ((! (o instanceof Data4)))
         return false;
-    final Data4 other = (Data4) o;
+    final @java.lang.SuppressWarnings("all") Data4 other = (Data4) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
@@ -171,7 +171,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return true;
     if ((! (o instanceof Data5)))
         return false;
-    final Data5 other = (Data5) o;
+    final @java.lang.SuppressWarnings("all") Data5 other = (Data5) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index d409382d..80e11be4 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -17,7 +17,7 @@
         return true;
     if ((! (o instanceof DataWithGetter)))
         return false;
-    final DataWithGetter other = (DataWithGetter) o;
+    final @java.lang.SuppressWarnings("all") DataWithGetter other = (DataWithGetter) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index 2380865b..a31ebece 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -17,7 +17,7 @@
         return true;
     if ((! (o instanceof DataWithGetterNone)))
         return false;
-    final DataWithGetterNone other = (DataWithGetterNone) o;
+    final @java.lang.SuppressWarnings("all") DataWithGetterNone other = (DataWithGetterNone) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java
index bb757b00..eeda5867 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCode.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java
@@ -8,7 +8,7 @@
         return true;
     if ((! (o instanceof EqualsAndHashCode)))
         return false;
-    final EqualsAndHashCode other = (EqualsAndHashCode) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode other = (EqualsAndHashCode) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
@@ -44,7 +44,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
         return true;
     if ((! (o instanceof EqualsAndHashCode2)))
         return false;
-    final EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
     if ((this.x != other.x))
         return false;
     return true;
@@ -65,7 +65,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
         return true;
     if ((! (o instanceof EqualsAndHashCode3)))
         return false;
-    final EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
@@ -87,7 +87,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
         return true;
     if ((! (o instanceof EqualsAndHashCode4)))
         return false;
-    final EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index dc732861..4876bd67 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -25,7 +25,7 @@
         return true;
     if ((! (o instanceof GetterLazyEahcToString)))
         return false;
-    final GetterLazyEahcToString other = (GetterLazyEahcToString) o;
+    final @java.lang.SuppressWarnings("all") GetterLazyEahcToString other = (GetterLazyEahcToString) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if (((this.getValue() == null) ? (other.getValue() != null) : (! this.getValue().equals((java.lang.Object) other.getValue()))))
diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java
index 252a2077..c9c96d0a 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -5,15 +5,12 @@ import java.lang.annotation.*;
   @lombok.NonNull int i;
   @lombok.NonNull String s;
   @NotNull Object o;
-  public @java.beans.ConstructorProperties({"i", "s", "o"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s, final @NotNull Object o) {
+  public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
     super();
     if ((s == null))
         throw new java.lang.NullPointerException("s");
-    if ((o == null))
-        throw new java.lang.NullPointerException("o");
     this.i = i;
     this.s = s;
-    this.o = o;
   }
   public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
@@ -21,7 +18,7 @@ import java.lang.annotation.*;
   public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
     return this.s;
   }
-  public @NotNull @java.lang.SuppressWarnings("all") Object getO() {
+  public @java.lang.SuppressWarnings("all") Object getO() {
     return this.o;
   }
   public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
@@ -32,9 +29,7 @@ import java.lang.annotation.*;
         throw new java.lang.NullPointerException("s");
     this.s = s;
   }
-  public @java.lang.SuppressWarnings("all") void setO(final @NotNull Object o) {
-    if ((o == null))
-        throw new java.lang.NullPointerException("o");
+  public @java.lang.SuppressWarnings("all") void setO(final Object o) {
     this.o = o;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SynchronizedPlain.java b/test/transform/resource/after-ecj/SynchronizedPlain.java
index 8e5b6297..6856f0ec 100644
--- a/test/transform/resource/after-ecj/SynchronizedPlain.java
+++ b/test/transform/resource/after-ecj/SynchronizedPlain.java
@@ -1,6 +1,6 @@
 import lombok.Synchronized;
 class SynchronizedPlain1 {
-  private final @java.lang.SuppressWarnings("all") java.lang.Object $lock = new java.lang.Object[0];
+  private final java.lang.Object $lock = new java.lang.Object[0];
   SynchronizedPlain1() {
     super();
   }
@@ -18,7 +18,7 @@ class SynchronizedPlain1 {
   }
 }
 class SynchronizedPlain2 {
-  private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0];
+  private static final java.lang.Object $LOCK = new java.lang.Object[0];
   <clinit>() {
   }
   SynchronizedPlain2() {
diff --git a/test/transform/resource/after-eclipse/DataExtended.java b/test/transform/resource/after-eclipse/DataExtended.java
index 924fe8da..dfc64f2d 100644
--- a/test/transform/resource/after-eclipse/DataExtended.java
+++ b/test/transform/resource/after-eclipse/DataExtended.java
@@ -14,7 +14,7 @@
         return true;
     if ((! (o instanceof DataExtended)))
         return false;
-    final DataExtended other = (DataExtended) o;
+    final @java.lang.SuppressWarnings("all") DataExtended other = (DataExtended) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-eclipse/DataIgnore.java b/test/transform/resource/after-eclipse/DataIgnore.java
index fb700ee2..109bf1d6 100644
--- a/test/transform/resource/after-eclipse/DataIgnore.java
+++ b/test/transform/resource/after-eclipse/DataIgnore.java
@@ -13,7 +13,7 @@
         return true;
     if ((! (o instanceof DataIgnore)))
         return false;
-    final DataIgnore other = (DataIgnore) o;
+    final @java.lang.SuppressWarnings("all") DataIgnore other = (DataIgnore) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-eclipse/DataOnLocalClass.java b/test/transform/resource/after-eclipse/DataOnLocalClass.java
index 6c85fae7..44ae0ddc 100644
--- a/test/transform/resource/after-eclipse/DataOnLocalClass.java
+++ b/test/transform/resource/after-eclipse/DataOnLocalClass.java
@@ -25,7 +25,7 @@ class DataOnLocalClass1 {
             return true;
         if ((! (o instanceof Local)))
             return false;
-        final Local other = (Local) o;
+        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
         if ((! other.canEqual((java.lang.Object) this)))
             return false;
         if ((this.getX() != other.getX()))
@@ -72,9 +72,9 @@ class DataOnLocalClass2 {
         public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
           if ((o == this))
               return true;
-          if ((! (o instanceof InnerLocal)))
+          if ((! (o instanceof Local.InnerLocal)))
               return false;
-          final InnerLocal other = (InnerLocal) o;
+          final @java.lang.SuppressWarnings("all") InnerLocal other = (InnerLocal) o;
           if ((! other.canEqual((java.lang.Object) this)))
               return false;
           if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -82,7 +82,7 @@ class DataOnLocalClass2 {
           return true;
         }
         public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-          return (other instanceof InnerLocal);
+          return (other instanceof Local.InnerLocal);
         }
         public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
           final int PRIME = 31;
@@ -107,7 +107,7 @@ class DataOnLocalClass2 {
             return true;
         if ((! (o instanceof Local)))
             return false;
-        final Local other = (Local) o;
+        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
         if ((! other.canEqual((java.lang.Object) this)))
             return false;
         if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-eclipse/DataPlain.java b/test/transform/resource/after-eclipse/DataPlain.java
index 0edf164b..0c4a6ab0 100644
--- a/test/transform/resource/after-eclipse/DataPlain.java
+++ b/test/transform/resource/after-eclipse/DataPlain.java
@@ -20,7 +20,7 @@ import lombok.Data;
         return true;
     if ((! (o instanceof Data1)))
         return false;
-    final Data1 other = (Data1) o;
+    final @java.lang.SuppressWarnings("all") Data1 other = (Data1) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -64,7 +64,7 @@ import lombok.Data;
         return true;
     if ((! (o instanceof Data2)))
         return false;
-    final Data2 other = (Data2) o;
+    final @java.lang.SuppressWarnings("all") Data2 other = (Data2) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -108,7 +108,7 @@ final @Data class Data3 {
         return true;
     if ((! (o instanceof Data3)))
         return false;
-    final Data3 other = (Data3) o;
+    final @java.lang.SuppressWarnings("all") Data3 other = (Data3) o;
     if ((this.getX() != other.getX()))
         return false;
     if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -139,7 +139,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return true;
     if ((! (o instanceof Data4)))
         return false;
-    final Data4 other = (Data4) o;
+    final @java.lang.SuppressWarnings("all") Data4 other = (Data4) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
@@ -171,7 +171,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return true;
     if ((! (o instanceof Data5)))
         return false;
-    final Data5 other = (Data5) o;
+    final @java.lang.SuppressWarnings("all") Data5 other = (Data5) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
diff --git a/test/transform/resource/after-eclipse/DataWithGetter.java b/test/transform/resource/after-eclipse/DataWithGetter.java
index d409382d..80e11be4 100644
--- a/test/transform/resource/after-eclipse/DataWithGetter.java
+++ b/test/transform/resource/after-eclipse/DataWithGetter.java
@@ -17,7 +17,7 @@
         return true;
     if ((! (o instanceof DataWithGetter)))
         return false;
-    final DataWithGetter other = (DataWithGetter) o;
+    final @java.lang.SuppressWarnings("all") DataWithGetter other = (DataWithGetter) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
diff --git a/test/transform/resource/after-eclipse/DataWithGetterNone.java b/test/transform/resource/after-eclipse/DataWithGetterNone.java
index 2380865b..a31ebece 100644
--- a/test/transform/resource/after-eclipse/DataWithGetterNone.java
+++ b/test/transform/resource/after-eclipse/DataWithGetterNone.java
@@ -17,7 +17,7 @@
         return true;
     if ((! (o instanceof DataWithGetterNone)))
         return false;
-    final DataWithGetterNone other = (DataWithGetterNone) o;
+    final @java.lang.SuppressWarnings("all") DataWithGetterNone other = (DataWithGetterNone) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
diff --git a/test/transform/resource/after-eclipse/EqualsAndHashCode.java b/test/transform/resource/after-eclipse/EqualsAndHashCode.java
index bb757b00..eeda5867 100644
--- a/test/transform/resource/after-eclipse/EqualsAndHashCode.java
+++ b/test/transform/resource/after-eclipse/EqualsAndHashCode.java
@@ -8,7 +8,7 @@
         return true;
     if ((! (o instanceof EqualsAndHashCode)))
         return false;
-    final EqualsAndHashCode other = (EqualsAndHashCode) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode other = (EqualsAndHashCode) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
@@ -44,7 +44,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
         return true;
     if ((! (o instanceof EqualsAndHashCode2)))
         return false;
-    final EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
     if ((this.x != other.x))
         return false;
     return true;
@@ -65,7 +65,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
         return true;
     if ((! (o instanceof EqualsAndHashCode3)))
         return false;
-    final EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
@@ -87,7 +87,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
         return true;
     if ((! (o instanceof EqualsAndHashCode4)))
         return false;
-    final EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
diff --git a/test/transform/resource/after-eclipse/GetterLazyEahcToString.java b/test/transform/resource/after-eclipse/GetterLazyEahcToString.java
index dc732861..4876bd67 100644
--- a/test/transform/resource/after-eclipse/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-eclipse/GetterLazyEahcToString.java
@@ -25,7 +25,7 @@
         return true;
     if ((! (o instanceof GetterLazyEahcToString)))
         return false;
-    final GetterLazyEahcToString other = (GetterLazyEahcToString) o;
+    final @java.lang.SuppressWarnings("all") GetterLazyEahcToString other = (GetterLazyEahcToString) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if (((this.getValue() == null) ? (other.getValue() != null) : (! this.getValue().equals((java.lang.Object) other.getValue()))))
diff --git a/test/transform/resource/after-eclipse/NonNullPlain.java b/test/transform/resource/after-eclipse/NonNullPlain.java
index 252a2077..c9c96d0a 100644
--- a/test/transform/resource/after-eclipse/NonNullPlain.java
+++ b/test/transform/resource/after-eclipse/NonNullPlain.java
@@ -5,15 +5,12 @@ import java.lang.annotation.*;
   @lombok.NonNull int i;
   @lombok.NonNull String s;
   @NotNull Object o;
-  public @java.beans.ConstructorProperties({"i", "s", "o"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s, final @NotNull Object o) {
+  public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
     super();
     if ((s == null))
         throw new java.lang.NullPointerException("s");
-    if ((o == null))
-        throw new java.lang.NullPointerException("o");
     this.i = i;
     this.s = s;
-    this.o = o;
   }
   public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
@@ -21,7 +18,7 @@ import java.lang.annotation.*;
   public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
     return this.s;
   }
-  public @NotNull @java.lang.SuppressWarnings("all") Object getO() {
+  public @java.lang.SuppressWarnings("all") Object getO() {
     return this.o;
   }
   public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
@@ -32,9 +29,7 @@ import java.lang.annotation.*;
         throw new java.lang.NullPointerException("s");
     this.s = s;
   }
-  public @java.lang.SuppressWarnings("all") void setO(final @NotNull Object o) {
-    if ((o == null))
-        throw new java.lang.NullPointerException("o");
+  public @java.lang.SuppressWarnings("all") void setO(final Object o) {
     this.o = o;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/SynchronizedPlain.java b/test/transform/resource/after-eclipse/SynchronizedPlain.java
index 8e5b6297..6856f0ec 100644
--- a/test/transform/resource/after-eclipse/SynchronizedPlain.java
+++ b/test/transform/resource/after-eclipse/SynchronizedPlain.java
@@ -1,6 +1,6 @@
 import lombok.Synchronized;
 class SynchronizedPlain1 {
-  private final @java.lang.SuppressWarnings("all") java.lang.Object $lock = new java.lang.Object[0];
+  private final java.lang.Object $lock = new java.lang.Object[0];
   SynchronizedPlain1() {
     super();
   }
@@ -18,7 +18,7 @@ class SynchronizedPlain1 {
   }
 }
 class SynchronizedPlain2 {
-  private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0];
+  private static final java.lang.Object $LOCK = new java.lang.Object[0];
   <clinit>() {
   }
   SynchronizedPlain2() {