[issue #2221] simplified configuration for `@Singular`-generated plural form nullchecks.

67 files changed, 455 insertions, 432 deletions

diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
index 04cd3bbb..3c84c71b 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
@@ -38,7 +38,9 @@ public class BuilderDefaultsWarnings {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
-			if (items == null) throw new java.lang.NullPointerException("items cannot be null");
+			if (items == null) {
+				throw new java.lang.NullPointerException("items cannot be null");
+			}
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.addAll(items);
 			return this;
diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
index 4cc247ef..f6fa22de 100644
--- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
+++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
@@ -36,7 +36,9 @@ class BuilderSingularAnnotatedTypes {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
-			if (foos == null) throw new java.lang.NullPointerException("foos cannot be null");
+			if (foos == null) {
+				throw new java.lang.NullPointerException("foos cannot be null");
+			}
 			if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
 			this.foos.addAll(foos);
 			return this;
@@ -64,7 +66,9 @@ class BuilderSingularAnnotatedTypes {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
-			if (bars == null) throw new java.lang.NullPointerException("bars cannot be null");
+			if (bars == null) {
+				throw new java.lang.NullPointerException("bars cannot be null");
+			}
 			if (this.bars$key == null) {
 				this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
 				this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>();
diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
index 90cc5570..6dbbeee4 100644
--- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
@@ -36,7 +36,9 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
-			if (foos == null) throw new java.lang.NullPointerException("foos cannot be null");
+			if (foos == null) {
+				throw new java.lang.NullPointerException("foos cannot be null");
+			}
 			if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
 			this.foos.addAll(foos);
 			return this;
@@ -64,7 +66,9 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
-			if (bars == null) throw new java.lang.NullPointerException("bars cannot be null");
+			if (bars == null) {
+				throw new java.lang.NullPointerException("bars cannot be null");
+			}
 			if (this.bars$key == null) {
 				this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
 				this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>();
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
index 650ab2fd..32b7c084 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
@@ -41,7 +41,9 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
-			if (cards == null) throw new java.lang.NullPointerException("cards cannot be null");
+			if (cards == null) {
+				throw new java.lang.NullPointerException("cards cannot be null");
+			}
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.addAll(cards);
 			return this;
@@ -59,7 +61,9 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
-			if (frogs == null) throw new java.lang.NullPointerException("frogs cannot be null");
+			if (frogs == null) {
+				throw new java.lang.NullPointerException("frogs cannot be null");
+			}
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.addAll(frogs);
 			return this;
@@ -77,7 +81,9 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
-			if (rawSet == null) throw new java.lang.NullPointerException("rawSet cannot be null");
+			if (rawSet == null) {
+				throw new java.lang.NullPointerException("rawSet cannot be null");
+			}
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.addAll(rawSet);
 			return this;
@@ -95,7 +101,9 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
-			if (passes == null) throw new java.lang.NullPointerException("passes cannot be null");
+			if (passes == null) {
+				throw new java.lang.NullPointerException("passes cannot be null");
+			}
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.addAll(passes);
 			return this;
@@ -113,7 +121,9 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
-			if (users == null) throw new java.lang.NullPointerException("users cannot be null");
+			if (users == null) {
+				throw new java.lang.NullPointerException("users cannot be null");
+			}
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.putAll(users);
 			return this;
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
index 6af1bf8d..9e3c6c15 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
@@ -31,7 +31,9 @@ class BuilderSingularGuavaMaps<K, V> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
-			if (battleaxes == null) throw new java.lang.NullPointerException("battleaxes cannot be null");
+			if (battleaxes == null) {
+				throw new java.lang.NullPointerException("battleaxes cannot be null");
+			}
 			if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
 			this.battleaxes.putAll(battleaxes);
 			return this;
@@ -49,7 +51,9 @@ class BuilderSingularGuavaMaps<K, V> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
-			if (vertices == null) throw new java.lang.NullPointerException("vertices cannot be null");
+			if (vertices == null) {
+				throw new java.lang.NullPointerException("vertices cannot be null");
+			}
 			if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.vertices.putAll(vertices);
 			return this;
@@ -67,7 +71,9 @@ class BuilderSingularGuavaMaps<K, V> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
-			if (rawMap == null) throw new java.lang.NullPointerException("rawMap cannot be null");
+			if (rawMap == null) {
+				throw new java.lang.NullPointerException("rawMap cannot be null");
+			}
 			if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
 			this.rawMap.putAll(rawMap);
 			return this;
diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java
index 43eb7702..f722dfcd 100644
--- a/test/transform/resource/after-delombok/BuilderSingularLists.java
+++ b/test/transform/resource/after-delombok/BuilderSingularLists.java
@@ -30,7 +30,9 @@ class BuilderSingularLists<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularLists.BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
-			if (children == null) throw new java.lang.NullPointerException("children cannot be null");
+			if (children == null) {
+				throw new java.lang.NullPointerException("children cannot be null");
+			}
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.addAll(children);
 			return this;
@@ -48,7 +50,9 @@ class BuilderSingularLists<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularLists.BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
-			if (scarves == null) throw new java.lang.NullPointerException("scarves cannot be null");
+			if (scarves == null) {
+				throw new java.lang.NullPointerException("scarves cannot be null");
+			}
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.addAll(scarves);
 			return this;
@@ -66,7 +70,9 @@ class BuilderSingularLists<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
-			if (rawList == null) throw new java.lang.NullPointerException("rawList cannot be null");
+			if (rawList == null) {
+				throw new java.lang.NullPointerException("rawList cannot be null");
+			}
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.addAll(rawList);
 			return this;
diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java
index d10dd090..f6073141 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java
@@ -46,7 +46,9 @@ class BuilderSingularMaps<K, V> {
 		}
 		@SuppressWarnings("all")
 		public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
-			if (women == null) throw new NullPointerException("women cannot be null");
+			if (women == null) {
+				throw new NullPointerException("women cannot be null");
+			}
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
 				this.women$value = new java.util.ArrayList<V>();
@@ -77,7 +79,9 @@ class BuilderSingularMaps<K, V> {
 		}
 		@SuppressWarnings("all")
 		public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
-			if (men == null) throw new NullPointerException("men cannot be null");
+			if (men == null) {
+				throw new NullPointerException("men cannot be null");
+			}
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
 				this.men$value = new java.util.ArrayList<Number>();
@@ -108,7 +112,9 @@ class BuilderSingularMaps<K, V> {
 		}
 		@SuppressWarnings("all")
 		public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
-			if (rawMap == null) throw new NullPointerException("rawMap cannot be null");
+			if (rawMap == null) {
+				throw new NullPointerException("rawMap cannot be null");
+			}
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<Object>();
 				this.rawMap$value = new java.util.ArrayList<Object>();
@@ -139,7 +145,9 @@ class BuilderSingularMaps<K, V> {
 		}
 		@SuppressWarnings("all")
 		public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
-			if (stringMap == null) throw new NullPointerException("stringMap cannot be null");
+			if (stringMap == null) {
+				throw new NullPointerException("stringMap cannot be null");
+			}
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
diff --git a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
index baa8f311..b3e92fb0 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
@@ -46,15 +46,16 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
 		}
 		@SuppressWarnings("all")
 		public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) {
-			if (women != null) {
-				if (this.women$key == null) {
-					this.women$key = new java.util.ArrayList<K>();
-					this.women$value = new java.util.ArrayList<V>();
-				}
-				for (java.util.Map.Entry<? extends K, ? extends V> $lombokEntry : women.entrySet()) {
-					this.women$key.add($lombokEntry.getKey());
-					this.women$value.add($lombokEntry.getValue());
-				}
+			if (women == null) {
+				throw new NullPointerException("women cannot be null");
+			}
+			if (this.women$key == null) {
+				this.women$key = new java.util.ArrayList<K>();
+				this.women$value = new java.util.ArrayList<V>();
+			}
+			for (java.util.Map.Entry<? extends K, ? extends V> $lombokEntry : women.entrySet()) {
+				this.women$key.add($lombokEntry.getKey());
+				this.women$value.add($lombokEntry.getValue());
 			}
 			return this;
 		}
@@ -78,15 +79,16 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
 		}
 		@SuppressWarnings("all")
 		public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) {
-			if (men != null) {
-				if (this.