Use safe null-check for collection values

JAVA-3635

Author: jyemin

driver-core/src/main/com/mongodb/assertions/Assertions.java

@@ -19,6 +19,8 @@
 
 import com.mongodb.internal.async.SingleResultCallback;
 
+import java.util.Collection;
+
 /**
  * <p>Design by contract assertions.</p> <p>This class is not part of the public API and may be removed or changed at any time.</p>
  */
@@ -100,6 +102,23 @@ public static void isTrueArgument(final String name, final boolean condition) {
         }
     }
 
+    /**
+     * Throw IllegalArgumentException if the collection contains a null value.
+     *
+     * @param name       the name of the collection
+     * @param collection the collection
+     * @throws java.lang.IllegalArgumentException if the collection contains a null value
+     */
+    public static void doesNotContainNull(final String name, final Collection<?> collection) {
+        // Use a loop instead of the contains method, as some implementations of that method will throw an exception if passed null as a
+        // parameter (in particular, lists returned by List.of methods)
+        for (Object o : collection) {
+            if (o == null) {
+                throw new IllegalArgumentException(name + " can not contain a null value");
+            }
+        }
+    }
+
     private Assertions() {
     }
 }

driver-core/src/main/com/mongodb/client/model/geojson/GeometryCollection.java

@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.doesNotContainNull;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -51,7 +51,7 @@ public GeometryCollection(@Nullable final CoordinateReferenceSystem coordinateRe
                               final List<? extends Geometry> geometries) {
         super(coordinateReferenceSystem);
         notNull("geometries", geometries);
-        isTrueArgument("geometries contains only non-null elements", !geometries.contains(null));
+        doesNotContainNull("geometries", geometries);
         this.geometries = Collections.unmodifiableList(geometries);
     }
 

driver-core/src/main/com/mongodb/client/model/geojson/LineString.java

@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.doesNotContainNull;
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -53,7 +54,7 @@ public LineString(@Nullable final CoordinateReferenceSystem coordinateReferenceS
         super(coordinateReferenceSystem);
         notNull("coordinates", coordinates);
         isTrueArgument("coordinates must contain at least two positions", coordinates.size() >= 2);
-        isTrueArgument("coordinates contains only non-null positions", !coordinates.contains(null));
+        doesNotContainNull("coordinates", coordinates);
 
         this.coordinates = Collections.unmodifiableList(coordinates);
     }

driver-core/src/main/com/mongodb/client/model/geojson/MultiLineString.java

@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.doesNotContainNull;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -55,7 +55,7 @@ public MultiLineString(@Nullable final CoordinateReferenceSystem coordinateRefer
 
         for (List<Position> line : coordinates) {
             notNull("line", line);
-            isTrueArgument("line contains only non-null positions", !line.contains(null));
+            doesNotContainNull("line", line);
         }
 
         this.coordinates = Collections.unmodifiableList(coordinates);

driver-core/src/main/com/mongodb/client/model/geojson/MultiPolygon.java

@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.doesNotContainNull;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -51,7 +51,7 @@ public MultiPolygon(final List<PolygonCoordinates> coordinates) {
     public MultiPolygon(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem, final List<PolygonCoordinates> coordinates) {
         super(coordinateReferenceSystem);
         notNull("coordinates", coordinates);
-        isTrueArgument("coordinates has no null elements", !coordinates.contains(null));
+        doesNotContainNull("coordinates", coordinates);
         this.coordinates = Collections.unmodifiableList(coordinates);
     }
 

driver-core/src/main/com/mongodb/client/model/geojson/PolygonCoordinates.java

@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.doesNotContainNull;
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -41,7 +42,7 @@ public final class PolygonCoordinates {
     @SafeVarargs
     public PolygonCoordinates(final List<Position> exterior, final List<Position>... holes) {
         notNull("exteriorRing", exterior);
-        isTrueArgument("ring contains only non-null positions", !exterior.contains(null));
+        doesNotContainNull("exterior", exterior);
         isTrueArgument("ring must contain at least four positions", exterior.size() >= 4);
         isTrueArgument("first and last position must be the same", exterior.get(0).equals(exterior.get(exterior.size() - 1)));
 
@@ -50,7 +51,7 @@ public PolygonCoordinates(final List<Position> exterior, final List<Position>...
         List<List<Position>> holesList = new ArrayList<List<Position>>(holes.length);
         for (List<Position> hole : holes) {
             notNull("interiorRing", hole);
-            isTrueArgument("ring contains only non-null positions", !hole.contains(null));
+            doesNotContainNull("hole", hole);
             isTrueArgument("ring must contain at least four positions", hole.size() >= 4);
             isTrueArgument("first and last position must be the same", hole.get(0).equals(hole.get(hole.size() - 1)));
             holesList.add(Collections.unmodifiableList(hole));

driver-core/src/main/com/mongodb/client/model/geojson/Position.java

@@ -22,6 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.doesNotContainNull;
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -41,7 +42,7 @@ public final class Position {
      */
     public Position(final List<Double> values) {
         notNull("values", values);
-        isTrueArgument("value contains only non-null elements", !values.contains(null));
+        doesNotContainNull("values", values);
         isTrueArgument("value must contain at least two elements", values.size() >= 2);
         this.values = Collections.unmodifiableList(values);
     }