Merge branch 'master' into master

19 files changed, 214 insertions, 52 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;
-}
diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java
new file mode 100644
index 00000000..7265e17a
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java
@@ -0,0 +1,57 @@
+import lombok.Singular;
+@lombok.Builder(toBuilder = true) class BuilderSingularToBuilderWithNull {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullBuilder {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> elems;
+    @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder elem(String elem) {
+      if ((this.elems == null))
+          this.elems = new java.util.ArrayList<String>();
+      this.elems.add(elem);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder elems(java.util.Collection<? extends String> elems) {
+      if ((this.elems == null))
+          this.elems = new java.util.ArrayList<String>();
+      this.elems.addAll(elems);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder clearElems() {
+      if ((this.elems != null))
+          this.elems.clear();
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") 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);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (("BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems) + ")");
+    }
+  }
+  private @Singular java.util.List<String> elems;
+  public static void test() {
+    new BuilderSingularToBuilderWithNull(null).toBuilder();
+  }
+  @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull(final java.util.List<String> elems) {
+    super();
+    this.elems = elems;
+  }
+  public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder builder() {
+    return new BuilderSingularToBuilderWithNullBuilder();
+  }
+  public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder toBuilder() {
+    return new BuilderSingularToBuilderWithNullBuilder().elems(((this.elems == null) ? java.util.Collections.emptyList() : this.elems));
+  }
+}
diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java
index d304293c..b9cc27dd 100644
--- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java
+++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java
@@ -74,7 +74,7 @@ import lombok.Builder;
     return new BuilderWithToBuilderBuilder<T>();
   }
   public @java.lang.SuppressWarnings("all") 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));
   }
 }
 @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder<T> {
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java
index f77203ba..674dd602 100644
--- a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java
+++ b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java
@@ -1,15 +1,23 @@
 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;
+public @FieldNameConstants(level = AccessLevel.PACKAGE) class FieldNameConstantsBasic {
+  static final @java.lang.SuppressWarnings("all") class Fields {
+    public static final java.lang.String butPrintMePlease = "butPrintMePlease";
+    public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer";
+    <clinit>() {
+    }
+    private @java.lang.SuppressWarnings("all") Fields() {
+      super();
+    }
+  }
+  String iAmADvdPlayer;
   int $skipMe;
   static double skipMeToo;
+  @FieldNameConstants.Exclude int andMe;
   String butPrintMePlease;
   <clinit>() {
   }
   public FieldNameConstantsBasic() {
     super();
   }
-}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java
index 44629ee5..7eb97364 100644
--- a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java
+++ b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java
@@ -1,9 +1,14 @@
 public @lombok.experimental.FieldNameConstants class FieldNameConstantsConfigKeys {
-  public static final java.lang.String I_AM_A_DVD_PLAYER_SFX = "iAmADvdPlayer";
-  String iAmADvdPlayer;
-  <clinit>() {
+  public static final @java.lang.SuppressWarnings("all") class Foobar {
+    public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer";
+    <clinit>() {
+    }
+    private @java.lang.SuppressWarnings("all") Foobar() {
+      super();
+    }
   }
+  String iAmADvdPlayer;
   public FieldNameConstantsConfigKeys() {
     super();
   }
-}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsEnum.java b/test/transform/resource/after-ecj/FieldNameConstantsEnum.java
new file mode 100644
index 00000000..053a6e7a
--- /dev/null
+++ b/test/transform/resource/after-ecj/FieldNameConstantsEnum.java
@@ -0,0 +1,23 @@
+import lombok.experimental.FieldNameConstants;
+import lombok.AccessLevel;
+public @FieldNameConstants(onlyExplicitlyIncluded = true,asEnum = true,innerTypeName = "TypeTest") class FieldNameConstantsEnum {
+  public @java.lang.SuppressWarnings("all") enum TypeTest {
+    iAmADvdPlayer(),
+    $dontSkipMe(),
+    alsoDontSkipMe(),
+    private @java.lang.SuppressWarnings("all") TypeTest() {
+      super();
+    }
+    <clinit>() {
+    }
+  }
+  @FieldNameConstants.Include String iAmADvdPlayer;
+  @FieldNameConstants.Include int $dontSkipMe;
+  static @FieldNameConstants.Include double alsoDontSkipMe;
+  int butSkipMe;
+  <clinit>() {
+  }
+  public FieldNameConstantsEnum() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsWeird.java b/test/transform/resource/after-ecj/FieldNameConstantsWeird.java
deleted file mode 100644
index 9958f664..00000000
--- a/test/transform/resource/after-ecj/FieldNameConstantsWeird.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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/before/BuilderSingularToBuilderWithNull.java b/test/transform/resource/before/BuilderSingularToBuilderWithNull.java
new file mode 100644
index 00000000..92a102cb
--- /dev/null
+++ b/test/transform/resource/before/BuilderSingularToBuilderWithNull.java
@@ -0,0 +1,10 @@
+import lombok.Singular;
+
+@lombok.Builder(toBuilder = true)
+class BuilderSingularToBuilderWithNull {
+	@Singular private java.util.List<String> elems;
+	
+	public static void test() {
+		new BuilderSingularToBuilderWithNull(null).toBuilder();
+	}
+}
diff --git a/test/transform/resource/before/FieldNameConstantsBasic.java b/test/transform/resource/before/FieldNameConstantsBasic.java
index 1bc15d84..2842dea3 100644
--- a/test/transform/resource/before/FieldNameConstantsBasic.java
+++ b/test/transform/resource/before/FieldNameConstantsBasic.java
@@ -1,11 +1,11 @@
 import lombok.experimental.FieldNameConstants;
 import lombok.AccessLevel;
 
-@FieldNameConstants
+@FieldNameConstants(level = AccessLevel.PACKAGE)
 public class FieldNameConstantsBasic {
-	@FieldNameConstants(level = AccessLevel.PROTECTED)
 	String iAmADvdPlayer;
 	int $skipMe;
 	static double skipMeToo;
+	@FieldNameConstants.Exclude int andMe;
 	String butPrintMePlease;
 }
diff --git a/test/transform/resource/before/FieldNameConstantsConfigKeys.java b/test/transform/resource/before/FieldNameConstantsConfigKeys.java
index ab8e3091..5595222c 100644
--- a/test/transform/resource/before/FieldNameConstantsConfigKeys.java
+++ b/test/transform/resource/before/FieldNameConstantsConfigKeys.java
@@ -1,5 +1,4 @@
-//CONF: lombok.fieldNameConstants.prefix = 
-//CONF: lombok.fieldNameConstants.suffix = _SFX
+//CONF: lombok.fieldNameConstants.innerTypeName = Foobar
 
 @lombok.experimental.FieldNameConstants
 public class FieldNameConstantsConfigKeys {
diff --git a/test/transform/resource/before/FieldNameConstantsEnum.java b/test/transform/resource/before/FieldNameConstantsEnum.java
new file mode 100644
index 00000000..d56bb280
--- /dev/null
+++ b/test/transform/resource/before/FieldNameConstantsEnum.java
@@ -0,0 +1,13 @@
+import lombok.experimental.FieldNameConstants;
+import lombok.AccessLevel;
+
+@FieldNameConstants(onlyExplicitlyIncluded = true, asEnum = true, innerTypeName = "TypeTest")
+public class FieldNameConstantsEnum {
+	@FieldNameConstants.Include
+	String iAmADvdPlayer;
+	@FieldNameConstants.Include
+	int $dontSkipMe;
+	@FieldNameConstants.Include
+	static double alsoDontSkipMe;
+	int butSkipMe;
+}
diff --git a/test/transform/resource/before/FieldNameConstantsWeird.java b/test/transform/resource/before/FieldNameConstantsWeird.java
deleted file mode 100644
index 74ec299a..00000000
--- a/test/transform/resource/before/FieldNameConstantsWeird.java
+++ /dev/null
@@ -1,12 +0,0 @@
-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/messages-delombok/FieldNameConstantsWeird.java.messages b/test/transform/resource/messages-delombok/FieldNameConstantsWeird.java.messages
deleted file mode 100644
index 02a38d58..00000000
--- a/test/transform/resource/messages-delombok/FieldNameConstantsWeird.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-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/FieldNameConstantsWeird.java.messages b/test/transform/resource/messages-ecj/FieldNameConstantsWeird.java.messages
deleted file mode 100644
index 02a38d58..00000000
--- a/test/transform/resource/messages-ecj/FieldNameConstantsWeird.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-9 Not generating constant for this field: The name of the constant would be equal to the name of this field.