add NPE checks on limited collections

jboulter · jboulter · commit 4202f391483d · 2022-11-04T13:39:06.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/objects/collections/SizeLimitingPyList.java b/src/main/java/com/hubspot/jinjava/objects/collections/SizeLimitingPyList.java
@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nonnull;
 
 public class SizeLimitingPyList extends PyList implements PyWrapper {
   private int maxSize;
@@ -20,6 +21,9 @@ private SizeLimitingPyList(List<Object> list) {
 
   public SizeLimitingPyList(List<Object> list, int maxSize) {
     super(list);
+    if (list == null) {
+      throw new IllegalArgumentException("list is null");
+    }
     if (maxSize <= 0) {
       throw new IllegalArgumentException("maxSize must be >= 1");
     }
@@ -31,25 +35,31 @@ public SizeLimitingPyList(List<Object> list, int maxSize) {
   }
 
   @Override
-  public boolean add(Object element) {
+  public boolean add(@Nonnull Object element) {
     checkSize(size() + 1);
     return super.add(element);
   }
 
   @Override
-  public void add(int index, Object element) {
+  public void add(int index, @Nonnull Object element) {
     checkSize(size() + 1);
     super.add(index, element);
   }
 
   @Override
-  public boolean addAll(int index, Collection<?> elements) {
+  public boolean addAll(int index, @Nonnull Collection<?> elements) {
+    if (elements == null || elements.isEmpty()) {
+      return false;
+    }
     checkSize(size() + elements.size());
     return super.addAll(index, elements);
   }
 
   @Override
-  public boolean addAll(Collection<?> elements) {
+  public boolean addAll(@Nonnull Collection<?> elements) {
+    if (elements == null || elements.isEmpty()) {
+      return false;
+    }
     checkSize(size() + elements.size());
     return super.addAll(elements);
   }
diff --git a/src/main/java/com/hubspot/jinjava/objects/collections/SizeLimitingPyMap.java b/src/main/java/com/hubspot/jinjava/objects/collections/SizeLimitingPyMap.java
@@ -19,6 +19,9 @@ private SizeLimitingPyMap(Map<String, Object> map) {
 
   public SizeLimitingPyMap(Map<String, Object> map, int maxSize) {
     super(map);
+    if (map == null) {
+      throw new IllegalArgumentException("map is null");
+    }
     if (maxSize <= 0) {
       throw new IllegalArgumentException("maxSize must be >= 1");
     }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ private SizeLimitingPyMap(Map<String, Object> map) {`
`19`	`19`
`20`	`20`	`public SizeLimitingPyMap(Map<String, Object> map, int maxSize) {`
`21`	`21`	`super(map);`
	`22`	`+ if (map == null) {`
	`23`	`+ throw new IllegalArgumentException("map is null");`
	`24`	`+ }`
`22`	`25`	`if (maxSize <= 0) {`
`23`	`26`	`throw new IllegalArgumentException("maxSize must be >= 1");`
`24`	`27`	`}`