Merge branch 'master' into master

6 files changed, 85 insertions, 11 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java
new file mode 100644
index 00000000..1f472438
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java
@@ -0,0 +1,63 @@
+class BuilderSingularToBuilderWithNull {
+	private java.util.List<String> elems;
+	public static void test() {
+		new BuilderSingularToBuilderWithNull(null).toBuilder();
+	}
+	@java.lang.SuppressWarnings("all")
+	BuilderSingularToBuilderWithNull(final java.util.List<String> elems) {
+		this.elems = elems;
+	}
+	@java.lang.SuppressWarnings("all")
+	public static class BuilderSingularToBuilderWithNullBuilder {
+		@java.lang.SuppressWarnings("all")
+		private java.util.ArrayList<String> elems;
+		@java.lang.SuppressWarnings("all")
+		BuilderSingularToBuilderWithNullBuilder() {
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSingularToBuilderWithNullBuilder elem(final String elem) {
+			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
+			this.elems.add(elem);
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection<? extends String> elems) {
+			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
+			this.elems.addAll(elems);
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSingularToBuilderWithNullBuilder clearElems() {
+			if (this.elems != null) this.elems.clear();
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSingularToBuilderWithNull build() {
+			java.util.List<String> elems;
+			switch (this.elems == null ? 0 : this.elems.size()) {
+			case 0: 
+				elems = java.util.Collections.emptyList();
+				break;
+			case 1: 
+				elems = java.util.Collections.singletonList(this.elems.get(0));
+				break;
+			default: 
+				elems = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.elems));
+			}
+			return new BuilderSingularToBuilderWithNull(elems);
+		}
+		@java.lang.Override
+		@java.lang.SuppressWarnings("all")
+		public java.lang.String toString() {
+			return "BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems + ")";
+		}
+	}
+	@java.lang.SuppressWarnings("all")
+	public static BuilderSingularToBuilderWithNullBuilder builder() {
+		return new BuilderSingularToBuilderWithNullBuilder();
+	}
+	@java.lang.SuppressWarnings("all")
+	public BuilderSingularToBuilderWithNullBuilder toBuilder() {
+		return new BuilderSingularToBuilderWithNullBuilder().elems(this.elems == null ? java.util.Collections.emptyList() : this.elems);
+	}
+}
diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java
index 46387f0f..b644a16f 100644
--- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java
+++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java
@@ -86,7 +86,7 @@ class BuilderWithToBuilder<T> {
 	}
 	@java.lang.SuppressWarnings("all")
 	public BuilderWithToBuilderBuilder<T> toBuilder() {
-		return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars);
+		return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars == null ? java.util.Collections.emptyList() : this.bars);
 	}
 }
 class ConstructorWithToBuilder<T> {
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java
index 4e547aa5..8be45d2b 100644
--- a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java
+++ b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java
@@ -1,8 +1,12 @@
 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;
+	int andMe;
 	String butPrintMePlease;
+	@java.lang.SuppressWarnings("all")
+	static final class Fields {
+		public static final java.lang.String butPrintMePlease = "butPrintMePlease";
+		public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer";
+	}
 }
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java
index c71b9264..4c2a53e3 100644
--- a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java
+++ b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java
@@ -1,4 +1,7 @@
 public class FieldNameConstantsConfigKeys {
-	public static final java.lang.String I_AM_A_DVD_PLAYER_SFX = "iAmADvdPlayer";
 	String iAmADvdPlayer;
-}
+	@java.lang.SuppressWarnings("all")
+	public static final class Foobar {
+		public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer";
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsEnum.java b/test/transform/resource/after-delombok/FieldNameConstantsEnum.java
new file mode 100644
index 00000000..c3fbf0c2
--- /dev/null
+++ b/test/transform/resource/after-delombok/FieldNameConstantsEnum.java
@@ -0,0 +1,10 @@
+public class FieldNameConstantsEnum {
+	String iAmADvdPlayer;
+	int $dontSkipMe;
+	static double alsoDontSkipMe;
+	int butSkipMe;
+	@java.lang.SuppressWarnings("all")
+	public enum TypeTest {
+		iAmADvdPlayer, $dontSkipMe, alsoDontSkipMe;
+	}
+}
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsWeird.java b/test/transform/resource/after-delombok/FieldNameConstantsWeird.java
deleted file mode 100644
index 6940f628..00000000
--- a/test/transform/resource/after-delombok/FieldNameConstantsWeird.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class FieldNameConstantsWeird {
-	public static final java.lang.String FIELD_AZ = "A";
-	String iAmADvdPlayer;
-	String X;
-	String A;
-}