Let all transforming collection constructors test for null arguments

Author: nicolaiparlog

src/main/java/org/codefx/libfx/collection/transform/EqualityTransformingMap.java

@@ -145,6 +145,7 @@ public static <K> Builder<K> withUnspecifiedKeyType() {
 	 * @return a new builder
 	 */
 	public static <K> Builder<K> withKeyType(Class<? super K> keyTypeToken) {
+		Objects.requireNonNull(keyTypeToken, "The argument 'keyTypeToken' must not be null.");
 		return new Builder<>(keyTypeToken);
 	}
 
@@ -217,6 +218,8 @@ static class EqHash<K> {
 		private final K outerKey;
 
 		private EqHash(EqualityTransformingMap<K, ?> transformingMap, K outerKey) {
+			assert transformingMap != null : "The argument 'transformingMap' must not be null.";
+
 			this.transformingMap = transformingMap;
 			this.outerKey = outerKey;
 		}
@@ -289,6 +292,7 @@ public Builder<K> withInnerMap(Supplier<Map<?, ?>> innerMapConstructor) {
 		 * @return this builder
 		 */
 		public Builder<K> withEqualsHandlingNull(BiPredicate<? super K, ? super K> equals) {
+			Objects.requireNonNull(equals, "The argument 'equals' must not be null.");
 			this.equals = equals;
 			return this;
 		}
@@ -299,6 +303,7 @@ public Builder<K> withEqualsHandlingNull(BiPredicate<? super K, ? super K> equal
 		 * @return this builder
 		 */
 		public Builder<K> withEquals(BiPredicate<? super K, ? super K> equals) {
+			Objects.requireNonNull(equals, "The argument 'equals' must not be null.");
 			return withEqualsHandlingNull(makeNullSafe(equals));
 		}
 
@@ -319,6 +324,7 @@ public Builder<K> withEquals(BiPredicate<? super K, ? super K> equals) {
 		 * @return this builder
 		 */
 		public Builder<K> withHashHandlingNull(ToIntFunction<? super K> hash) {
+			Objects.requireNonNull(hash, "The argument 'hash' must not be null.");
 			this.hash = hash;
 			return this;
 		}
@@ -329,6 +335,7 @@ public Builder<K> withHashHandlingNull(ToIntFunction<? super K> hash) {
 		 * @return this builder
 		 */
 		public Builder<K> withHash(ToIntFunction<? super K> hash) {
+			Objects.requireNonNull(hash, "The argument 'hash' must not be null.");
 			return withHashHandlingNull(makeNullSafe(hash));
 		}
 

src/main/java/org/codefx/libfx/collection/transform/OptionalTransformingCollection.java

@@ -62,9 +62,11 @@ public final class OptionalTransformingCollection<E> extends AbstractTransformin
 	 */
 	public OptionalTransformingCollection(
 			Collection<Optional<E>> innerCollection,
-			Class<? super E> outerTypeToken, E outerDefaultElement) {
+			Class<? super E> outerTypeToken,
+			E outerDefaultElement) {
 		Objects.requireNonNull(innerCollection, "The argument 'innerCollection' must not be null.");
 		Objects.requireNonNull(outerTypeToken, "The argument 'outerTypeToken' must not be null.");
+		// 'outerDefaultElement' can be null
 
 		this.innerCollection = innerCollection;
 		this.outerTypeToken = outerTypeToken;

src/main/java/org/codefx/libfx/collection/transform/OptionalTransformingList.java

@@ -63,9 +63,11 @@ public final class OptionalTransformingList<E> extends AbstractTransformingList<
 	 */
 	public OptionalTransformingList(
 			List<Optional<E>> innerList,
-			Class<? super E> outerTypeToken, E outerDefaultElement) {
+			Class<? super E> outerTypeToken,
+			E outerDefaultElement) {
 		Objects.requireNonNull(innerList, "The argument 'innerList' must not be null.");
 		Objects.requireNonNull(outerTypeToken, "The argument 'outerTypeToken' must not be null.");
+		// 'outerDefaultElement' can be null
 
 		this.innerList = innerList;
 		this.outerTypeToken = outerTypeToken;

src/main/java/org/codefx/libfx/collection/transform/OptionalTransformingSet.java

@@ -63,9 +63,11 @@ public final class OptionalTransformingSet<E> extends AbstractTransformingSet<Op
 	 */
 	public OptionalTransformingSet(
 			Set<Optional<E>> innerSet,
-			Class<? super E> outerTypeToken, E outerDefaultElement) {
+			Class<? super E> outerTypeToken,
+			E outerDefaultElement) {
 		Objects.requireNonNull(innerSet, "The argument 'innerSet' must not be null.");
 		Objects.requireNonNull(outerTypeToken, "The argument 'outerTypeToken' must not be null.");
+		// 'outerDefaultElement' can be null
 
 		this.innerSet = innerSet;
 		this.outerTypeToken = outerTypeToken;

src/main/java/org/codefx/libfx/collection/transform/TransformingIterator.java

@@ -40,7 +40,6 @@ public final class TransformingIterator<I, O> extends AbstractTransformingIterat
 	 *            transforms elements from the inner type {@code I} to the outer type {@code O}
 	 */
 	public TransformingIterator(Iterator<I> innerIterator, Function<I, O> transformToOuter) {
-
 		Objects.requireNonNull(innerIterator, "The argument 'innerIterator' must not be null.");
 		Objects.requireNonNull(transformToOuter, "The argument 'transformToOuter' must not be null.");
 

src/main/java/org/codefx/libfx/collection/transform/TransformingMap.java

@@ -94,6 +94,16 @@ public TransformingMap(
 			Class<IV> innerValueTypeToken, Function<IV, OV> transformToOuterValue,
 			Class<OV> outerValueTypeToken, Function<OV, IV> transformToInnerValue) {
 
+		Objects.requireNonNull(innerMap, "The argument 'innerMap' must not be null.");
+		Objects.requireNonNull(innerKeyTypeToken, "The argument 'innerKeyTypeToken' must not be null.");
+		Objects.requireNonNull(transformToOuterKey, "The argument 'transformToOuterKey' must not be null.");
+		Objects.requireNonNull(outerKeyTypeToken, "The argument 'outerKeyTypeToken' must not be null.");
+		Objects.requireNonNull(transformToInnerKey, "The argument 'transformToInnerKey' must not be null.");
+		Objects.requireNonNull(innerValueTypeToken, "The argument 'innerValueTypeToken' must not be null.");
+		Objects.requireNonNull(transformToOuterValue, "The argument 'transformToOuterValue' must not be null.");
+		Objects.requireNonNull(outerValueTypeToken, "The argument 'outerValueTypeToken' must not be null.");
+		Objects.requireNonNull(transformToInnerValue, "The argument 'transformToInnerValue' must not be null.");
+
 		this.innerMap = innerMap;
 		this.outerKeyTypeToken = outerKeyTypeToken;
 		this.innerKeyTypeToken = innerKeyTypeToken;