Use Object as the type in case schema property contains mixed types

Closes #1425
joelittlejohn · Feb 14, 2023 · e6de81b · e6de81b
1 parent 35100c7
commit e6de81b
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 20 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/TypeRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/TypeRule.java
@@ -21,6 +21,9 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.Schema;
@@ -119,19 +122,22 @@ public JType apply(String nodeName, JsonNode node, JsonNode parent, JClassContai
   }
 
   private String getTypeName(JsonNode node) {
-    if (node.has("type") && node.get("type").isArray() && node.get("type").size() > 0) {
-      for (JsonNode jsonNode : node.get("type")) {
-        String typeName = jsonNode.asText();
-        if (!typeName.equals("null")) {
-          return typeName;
+    if (node.has("type")) {
+      final JsonNode typeNode = node.get("type");
+      if (typeNode.isArray() && typeNode.size() > 0) {
+        final List<String> typeValues = StreamSupport.stream(typeNode.spliterator(), false)
+                .map(JsonNode::asText)
+                .filter(n -> !"null".equals(n))
+                .collect(Collectors.toList());
+
+        if (typeValues.size() == 1) {
+            return typeValues.get(0);
         }
+      } else if (typeNode.isTextual()) {
+          return typeNode.asText();
       }
     }
 
-    if (node.has("type") && node.get("type").isTextual()) {
-      return node.get("type").asText();
-    }
-
     return DEFAULT_TYPE_NAME;
   }
 

diff --git a/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/TypeIT.java b/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/TypeIT.java
@@ -282,13 +282,13 @@ public void useDoubleNumbersFalseCausesPrimitiveNumbersToBecomeFloats() throws C
     }
 
     @Test
-    public void unionTypesChooseFirstTypePresent() throws ClassNotFoundException, SecurityException, NoSuchMethodException {
+    public void unionTypesChooseFirstTypePresent() throws ReflectiveOperationException {
 
         Class<?> classWithUnionProperties = schemaRule.generateAndCompile("/schema/type/unionTypes.json", "com.example").loadClass("com.example.UnionTypes");
 
-        Method booleanGetter = classWithUnionProperties.getMethod("getBooleanProperty");
+        Method nullTypeGetter = classWithUnionProperties.getMethod("getNullProperty");
 
-        assertThat(booleanGetter.getReturnType().getName(), is("java.lang.Boolean"));
+        assertThat(nullTypeGetter.getReturnType().getName(), is("java.lang.Object"));
 
         Method stringGetter = classWithUnionProperties.getMethod("getStringProperty");
 
@@ -297,6 +297,20 @@ public void unionTypesChooseFirstTypePresent() throws ClassNotFoundException, Se
         Method integerGetter = classWithUnionProperties.getMethod("getIntegerProperty");
 
         assertThat(integerGetter.getReturnType().getName(), is("java.lang.Integer"));
+
+        Method booleanGetter = classWithUnionProperties.getMethod("getBooleanProperty");
+        assertThat(booleanGetter.getReturnType().getName(), is("java.lang.Boolean"));
+    }
+
+    @Test
+    public void mixedUnionTypesReturnObject() throws ReflectiveOperationException {
+        Class<?> classWithMixedUnionProperties = schemaRule.generateAndCompile("/schema/type/mixedUnionTypes.json", "com.example").loadClass("com.example.MixedUnionTypes");
+
+        Method mixedTypesGetter = classWithMixedUnionProperties.getMethod("getMixedTypesProperty");
+        assertThat(mixedTypesGetter.getReturnType().getName(), is("java.lang.Object"));
+
+        Method mixedTypesWithNullGetter = classWithMixedUnionProperties.getMethod("getMixedTypesWithNullProperty");
+        assertThat(mixedTypesWithNullGetter.getReturnType().getName(), is("java.lang.Object"));
     }
 
     @SuppressWarnings("rawtypes")

diff --git a/...pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/yaml/YamlTypeIT.java b/...pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/yaml/YamlTypeIT.java
@@ -271,13 +271,13 @@ public void useDoubleNumbersFalseCausesPrimitiveNumbersToBecomeFloats() throws C
     }
 
     @Test
-    public void unionTypesChooseFirstTypePresent() throws ClassNotFoundException, SecurityException, NoSuchMethodException {
+    public void unionTypesChooseFirstTypePresent() throws ReflectiveOperationException {
 
         Class<?> classWithUnionProperties = schemaRule.generateAndCompile("/schema/yaml/type/unionTypes.yaml", "com.example", config("sourceType", "yamlschema")).loadClass("com.example.UnionTypes");
 
-        Method booleanGetter = classWithUnionProperties.getMethod("getBooleanProperty");
+        Method nullTypeGetter = classWithUnionProperties.getMethod("getNullProperty");
 
-        assertThat(booleanGetter.getReturnType().getName(), is("java.lang.Boolean"));
+        assertThat(nullTypeGetter.getReturnType().getName(), is("java.lang.Object"));
 
         Method stringGetter = classWithUnionProperties.getMethod("getStringProperty");
 
@@ -286,6 +286,20 @@ public void unionTypesChooseFirstTypePresent() throws ClassNotFoundException, Se
         Method integerGetter = classWithUnionProperties.getMethod("getIntegerProperty");
 
         assertThat(integerGetter.getReturnType().getName(), is("java.lang.Integer"));
+
+        Method booleanGetter = classWithUnionProperties.getMethod("getBooleanProperty");
+        assertThat(booleanGetter.getReturnType().getName(), is("java.lang.Boolean"));
+    }
+
+    @Test
+    public void mixedUnionTypesReturnObject() throws ReflectiveOperationException {
+        Class<?> classWithMixedUnionProperties = schemaRule.generateAndCompile("/schema/yaml/type/mixedUnionTypes.yaml", "com.example", config("sourceType", "yamlschema")).loadClass("com.example.MixedUnionTypes");
+
+        Method mixedTypesGetter = classWithMixedUnionProperties.getMethod("getMixedTypesProperty");
+        assertThat(mixedTypesGetter.getReturnType().getName(), is("java.lang.Object"));
+
+        Method mixedTypesWithNullGetter = classWithMixedUnionProperties.getMethod("getMixedTypesWithNullProperty");
+        assertThat(mixedTypesWithNullGetter.getReturnType().getName(), is("java.lang.Object"));
     }
 
     @SuppressWarnings("rawtypes")

diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/type/mixedUnionTypes.json b/jsonschema2pojo-integration-tests/src/test/resources/schema/type/mixedUnionTypes.json
@@ -0,0 +1,11 @@
+{
+    "type" : "object",
+    "properties" : {
+        "mixedTypesProperty": {
+            "type": ["boolean", "string"]
+        },
+        "mixedTypesWithNullProperty": {
+            "type": ["null", "string", "boolean"]
+        }
+    }
+}
diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/type/unionTypes.json b/jsonschema2pojo-integration-tests/src/test/resources/schema/type/unionTypes.json
@@ -1,14 +1,17 @@
 {
     "type" : "object",
     "properties" : {
-        "booleanProperty" : {
-            "type" : ["boolean", "string"]
+        "nullProperty" : {
+            "type" : ["null"]
         },
         "stringProperty" : {
             "type" : ["string"]
         },
         "integerProperty" : {
             "type" : ["integer", "null"]
+        },
+        "booleanProperty": {
+            "type" : ["null", "boolean"]
         }
     }
 }
diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/yaml/type/mixedUnionTypes.yaml b/jsonschema2pojo-integration-tests/src/test/resources/schema/yaml/type/mixedUnionTypes.yaml
@@ -0,0 +1,11 @@
+properties:
+  mixedTypesProperty:
+    type:
+      - boolean
+      - string
+  mixedTypesWithNullProperty:
+    type:
+      - 'null'
+      - string
+      - boolean
+type: object
diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/yaml/type/unionTypes.yaml b/jsonschema2pojo-integration-tests/src/test/resources/schema/yaml/type/unionTypes.yaml
@@ -1,13 +1,16 @@
 properties:
-  booleanProperty:
+  nullProperty:
     type:
-    - boolean
-    - string
+    - 'null'
   integerProperty:
     type:
     - integer
     - 'null'
   stringProperty:
     type:
     - string
+  booleanProperty:
+    type:
+    - 'null'
+    - boolean
 type: object