Merge remote-tracking branch 'remotes/upstream/master'

10 files changed, 47 insertions, 89 deletions

diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
deleted file mode 100644
index f789f535..00000000
--- a/test/transform/resource/after-ecj/BuilderChainAndFluent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-@lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent {
-  public static @java.lang.SuppressWarnings("all") class BuilderChainAndFluentBuilder {
-    private @java.lang.SuppressWarnings("all") int yes;
-    @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder() {
-      super();
-    }
-    public @java.lang.SuppressWarnings("all") void setYes(final int yes) {
-      this.yes = yes;
-    }
-    public @java.lang.SuppressWarnings("all") BuilderChainAndFluent build() {
-      return new BuilderChainAndFluent(yes);
-    }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")");
-    }
-  }
-  private final int yes;
-  @java.lang.SuppressWarnings("all") BuilderChainAndFluent(final int yes) {
-    super();
-    this.yes = yes;
-  }
-  public static @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder builder() {
-    return new BuilderChainAndFluentBuilder();
-  }
-}
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index 8f520ae5..93d70fe9 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -1,5 +1,5 @@
 import java.util.List;
-import lombok.experimental.Builder;
+import lombok.Builder;
 class BuilderComplex {
   public static @java.lang.SuppressWarnings("all") class VoidBuilder<T extends Number> {
     private @java.lang.SuppressWarnings("all") T number;
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java
new file mode 100644
index 00000000..164d0f15
--- /dev/null
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java
@@ -0,0 +1,32 @@
+public class EqualsAndHashCodeWithGenericsOnInners<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 EqualsAndHashCodeWithGenericsOnInners.Inner)))
+          return false;
+      final EqualsAndHashCodeWithGenericsOnInners<?>.Inner<?> other = (EqualsAndHashCodeWithGenericsOnInners<?>.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 EqualsAndHashCodeWithGenericsOnInners.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;
+    }
+  }
+  public EqualsAndHashCodeWithGenericsOnInners() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/ValueExperimental.java b/test/transform/resource/after-ecj/ValueExperimental.java
deleted file mode 100644
index dd13574a..00000000
--- a/test/transform/resource/after-ecj/ValueExperimental.java
+++ /dev/null
@@ -1,39 +0,0 @@
-import lombok.experimental.Value;
-final @Value class ValueExperimental1 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof ValueExperimental1)))
-        return false;
-    return true;
-  }
-  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 "ValueExperimental1()";
-  }
-  public @java.lang.SuppressWarnings("all") ValueExperimental1() {
-    super();
-  }
-}
-final @lombok.experimental.Value class ValueExperimental2 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof ValueExperimental2)))
-        return false;
-    return true;
-  }
-  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 "ValueExperimental2()";
-  }
-  public @java.lang.SuppressWarnings("all") ValueExperimental2() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
deleted file mode 100644
index b69e85d9..00000000
--- a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-import lombok.experimental.*;
-final @Value class ValueExperimentalStarImport {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof ValueExperimentalStarImport)))
-        return false;
-    return true;
-  }
-  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 "ValueExperimentalStarImport()";
-  }
-  public @java.lang.SuppressWarnings("all") ValueExperimentalStarImport() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-ecj/VarComplex.java b/test/transform/resource/after-ecj/VarComplex.java
index 10c456eb..97a0a177 100644
--- a/test/transform/resource/after-ecj/VarComplex.java
+++ b/test/transform/resource/after-ecj/VarComplex.java
@@ -1,4 +1,4 @@
-import lombok.experimental.var;
+import lombok.var;
 public class VarComplex {
   private String field = "";
   private static final int CONSTANT = 20;
diff --git a/test/transform/resource/after-ecj/VarInFor.java b/test/transform/resource/after-ecj/VarInFor.java
index 0192aaed..1799d9b7 100644
--- a/test/transform/resource/after-ecj/VarInFor.java
+++ b/test/transform/resource/after-ecj/VarInFor.java
@@ -1,4 +1,4 @@
-import lombok.experimental.var;
+import lombok.var;
 public class VarInFor {
   public VarInFor() {
     super();
diff --git a/test/transform/resource/after-ecj/VarInForOld.java b/test/transform/resource/after-ecj/VarInForOld.java
index 98fedf03..065ea94d 100644
--- a/test/transform/resource/after-ecj/VarInForOld.java
+++ b/test/transform/resource/after-ecj/VarInForOld.java
@@ -1,4 +1,4 @@
-import lombok.experimental.var;
+import lombok.var;
 public class VarInForOld {
   public VarInForOld() {
     super();
diff --git a/test/transform/resource/after-ecj/VarNullInit.java b/test/transform/resource/after-ecj/VarNullInit.java
index 3eb2d506..848744cc 100644
--- a/test/transform/resource/after-ecj/VarNullInit.java
+++ b/test/transform/resource/after-ecj/VarNullInit.java
@@ -1,4 +1,4 @@
-import lombok.experimental.var;
+import lombok.var;
 public class VarNullInit {
   public VarNullInit() {
     super();
diff --git a/test/transform/resource/after-ecj/VarWarning.java b/test/transform/resource/after-ecj/VarWarning.java
new file mode 100644
index 00000000..4caf90f8
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarWarning.java
@@ -0,0 +1,10 @@
+import lombok.var;
+public class VarWarning {
+  public VarWarning() {
+    super();
+  }
+  public void isOkay() {
+    @var java.lang.String x = "Warning";
+    x.toLowerCase();
+  }
+}
\ No newline at end of file