From 3d432c38d0cfeb36b8e7402eca56faaafcf7bac7 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Sun, 29 Jul 2018 16:37:21 +0200
Subject: code impl of FieldNameConstants rewrite + test updates for it

---
 test/transform/resource/before/FieldNameConstantsBasic.java |  4 ++--
 .../resource/before/FieldNameConstantsConfigKeys.java       |  3 +--
 test/transform/resource/before/FieldNameConstantsEnum.java  | 13 +++++++++++++
 test/transform/resource/before/FieldNameConstantsWeird.java | 12 ------------
 4 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 test/transform/resource/before/FieldNameConstantsEnum.java
 delete mode 100644 test/transform/resource/before/FieldNameConstantsWeird.java

(limited to 'test/transform/resource/before')

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;
-}
-- 
cgit 


From ca35539f7cd7967bfd8518d0ad0b0015bdd40cfc Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Tue, 21 Aug 2018 00:01:40 +0200
Subject: [fixes #1812] `@Singular` marked collections which nevertheless
 somehow ended up null would cause an NPE during `toBuilder()` invocations.

---
 .../resource/before/BuilderSingularToBuilderWithNull.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 test/transform/resource/before/BuilderSingularToBuilderWithNull.java

(limited to 'test/transform/resource/before')

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();
+	}
+}
-- 
cgit