Allow array properties to have a null default value

Closes #156.
joelittlejohn · Mar 5, 2014 · b92b336 · b92b336
1 parent e1e3ab7
commit b92b336
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DefaultRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DefaultRule.java
@@ -82,7 +82,10 @@ public JFieldVar apply(String nodeName, JsonNode node, JFieldVar field, Schema c
 
         String fieldType = field.type().fullName();
 
-        if (fieldType.startsWith(List.class.getName())) {
+        if (defaultPresent && !field.type().isPrimitive() && node.isNull()) {
+            field.init(JExpr._null());
+
+        } else if (fieldType.startsWith(List.class.getName())) {
             field.init(getDefaultList(field.type(), node));
 
         } else if (fieldType.startsWith(Set.class.getName())) {
@@ -98,10 +101,6 @@ public JFieldVar apply(String nodeName, JsonNode node, JFieldVar field, Schema c
 
     private JExpression getDefaultValue(JType fieldType, JsonNode node) {
 
-        if (!fieldType.isPrimitive() && node.isNull()) {
-            return JExpr._null();
-        }
-
         fieldType = fieldType.unboxify();
 
         if (fieldType.fullName().equals(String.class.getName())) {

diff --git a/...chema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/DefaultIT.java b/...chema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/DefaultIT.java
@@ -16,8 +16,8 @@
 
 package org.jsonschema2pojo.integration;
 
-import static org.jsonschema2pojo.integration.util.CodeGenerationHelper.*;
 import static org.hamcrest.Matchers.*;
+import static org.jsonschema2pojo.integration.util.CodeGenerationHelper.*;
 import static org.junit.Assert.*;
 
 import java.lang.reflect.InvocationTargetException;
@@ -155,6 +155,17 @@ public void simplePropertyCanHaveNullDefaultValue() throws NoSuchMethodException
         assertThat(getter.invoke(instance), is(nullValue()));
 
     }
+
+    @Test
+    public void arrayPropertyCanHaveNullDefaultValue() throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException {
+
+        Object instance = classWithDefaults.newInstance();
+
+        Method getter = classWithDefaults.getMethod("getArrayPropertyWithNullDefault");
+
+        assertThat(getter.invoke(instance), is(nullValue()));
+
+    }
 
     @Test
     @SuppressWarnings("unchecked")

diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/default/default.json b/jsonschema2pojo-integration-tests/src/test/resources/schema/default/default.json
@@ -64,6 +64,13 @@
             "type" : "integer",
             "default" : null
         },
+        "arrayPropertyWithNullDefault" : {
+            "type" : "array",
+            "items" : {
+                "type" : "string"
+            },
+            "default" : null
+        },
         "uniqueArrayWithDefault" : {
             "type" : "array",
             "uniqueItems" : true,