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

6 files changed, 37 insertions, 103 deletions

diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
deleted file mode 100644
index f9833be6..00000000
--- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-class BuilderChainAndFluent {
-	private final int yes;
-	@java.lang.SuppressWarnings("all")
-	BuilderChainAndFluent(final int yes) {
-		this.yes = yes;
-	}
-	@java.lang.SuppressWarnings("all")
-	public static class BuilderChainAndFluentBuilder {
-		@java.lang.SuppressWarnings("all")
-		private int yes;
-		@java.lang.SuppressWarnings("all")
-		BuilderChainAndFluentBuilder() {
-		}
-		@java.lang.SuppressWarnings("all")
-		public void setYes(final int yes) {
-			this.yes = yes;
-		}
-		@java.lang.SuppressWarnings("all")
-		public BuilderChainAndFluent build() {
-			return new BuilderChainAndFluent(yes);
-		}
-		@java.lang.Override
-		@java.lang.SuppressWarnings("all")
-		public java.lang.String toString() {
-			return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")";
-		}
-	}
-	@java.lang.SuppressWarnings("all")
-	public static BuilderChainAndFluentBuilder builder() {
-		return new BuilderChainAndFluentBuilder();
-	}
-}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java
new file mode 100644
index 00000000..501d45a1
--- /dev/null
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java
@@ -0,0 +1,28 @@
+public class EqualsAndHashCodeWithGenericsOnInners<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 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;
+		}
+		@java.lang.SuppressWarnings("all")
+		protected boolean canEqual(final java.lang.Object other) {
+			return other instanceof EqualsAndHashCodeWithGenericsOnInners.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/JavadocGenerally.java b/test/transform/resource/after-delombok/JavadocGenerally.java
index 729cdce3..ec9483bc 100644
--- a/test/transform/resource/after-delombok/JavadocGenerally.java
+++ b/test/transform/resource/after-delombok/JavadocGenerally.java
@@ -9,6 +9,9 @@ package testPackage;
 class JavadocGenerally {
 	/**
 	 * Doc on field
+	 * <pre>
+	 * 	// code
+	 * </pre>
 	 */
 	private int someField;
 	/**
diff --git a/test/transform/resource/after-delombok/ValueExperimental.java b/test/transform/resource/after-delombok/ValueExperimental.java
deleted file mode 100644
index 5846a2d8..00000000
--- a/test/transform/resource/after-delombok/ValueExperimental.java
+++ /dev/null
@@ -1,46 +0,0 @@
-final class ValueExperimental1 {
-	@java.lang.SuppressWarnings("all")
-	public ValueExperimental1() {
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public boolean equals(final java.lang.Object o) {
-		if (o == this) return true;
-		if (!(o instanceof ValueExperimental1)) return false;
-		return true;
-	}
-	@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 "ValueExperimental1()";
-	}
-}
-final class ValueExperimental2 {
-	@java.lang.SuppressWarnings("all")
-	public ValueExperimental2() {
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public boolean equals(final java.lang.Object o) {
-		if (o == this) return true;
-		if (!(o instanceof ValueExperimental2)) return false;
-		return true;
-	}
-	@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 "ValueExperimental2()";
-	}
-}
diff --git a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
deleted file mode 100644
index cb755b47..00000000
--- a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import lombok.experimental.*;
-final class ValueExperimentalStarImport {
-	@java.lang.SuppressWarnings("all")
-	public ValueExperimentalStarImport() {
-		
-	}
-	@java.lang.Override
-	@java.lang.SuppressWarnings("all")
-	public boolean equals(final java.lang.Object o) {
-		if (o == this) return true;
-		if (!(o instanceof ValueExperimentalStarImport)) return false;
-		return true;
-	}
-	@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 "ValueExperimentalStarImport()";
-	}
-}
diff --git a/test/transform/resource/after-delombok/VarWarning.java b/test/transform/resource/after-delombok/VarWarning.java
new file mode 100644
index 00000000..a333c87c
--- /dev/null
+++ b/test/transform/resource/after-delombok/VarWarning.java
@@ -0,0 +1,6 @@
+public class VarWarning {
+	public void isOkay() {
+		java.lang.String x = "Warning";
+		x.toLowerCase();
+	}
+}
\ No newline at end of file