Renamed to updatePojo and validating that passed pojo is in fact a pojo

lightblue-platform · Jan 20, 2017 · aa3931d · aa3931d
1 parent 3c657a8
commit aa3931d
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/core/src/main/java/com/redhat/lightblue/client/Update.java b/core/src/main/java/com/redhat/lightblue/client/Update.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -225,9 +226,15 @@ public static Update update(ContainerNode node) {
      * @param pojo
      * @return
      */
-    public static Update update(Object pojo) {
+    public static Update updatePojo(Object pojo) {
+      Objects.requireNonNull(pojo, "Pojo cannot be null");
+
       ObjectNode set = JsonNodeFactory.instance.objectNode();
-      set.set("$set", JSON.toJsonNode(pojo));
+      JsonNode pojoAsJson = JSON.toJsonNode(pojo);
+      if (!(pojoAsJson instanceof ObjectNode)) {
+        throw new IllegalArgumentException(pojo+" is not a pojo!");
+      }
+      set.set("$set", pojoAsJson);
       return new Update(set);
     }
 

diff --git a/core/src/test/java/com/redhat/lightblue/client/ExpressionTest.java b/core/src/test/java/com/redhat/lightblue/client/ExpressionTest.java
@@ -1,5 +1,7 @@
 package com.redhat.lightblue.client;
 
+import java.util.Arrays;
+
 import org.json.JSONException;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -86,8 +88,33 @@ public int getI() {
     }
 
     @Test
-    public void updatePojoTest() throws Exception {
-      eq("{'$set':{'foo':'bar','i':13}}", Update.update(new Pojo()));
+    public void updatePojoValidTest() throws Exception {
+      eq("{'$set':{'foo':'bar','i':13}}", Update.updatePojo(new Pojo()));
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void updatePojoInvalidStringTest() throws Exception {
+      Update.updatePojo("foo");
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void updatePojoInvalidPrimitiveTest() throws Exception {
+      Update.updatePojo(3);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void updatePojoInvalidArrayTest() throws Exception {
+      Update.updatePojo(new Pojo[] { new Pojo(), new Pojo()});
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void updatePojoInvalidListTest() throws Exception {
+      Update.updatePojo(Arrays.asList(new Pojo[] { new Pojo(), new Pojo()}));
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void updatePojoInvalidNullTest() throws Exception {
+      Update.updatePojo(null);
     }
 
     @Test