Version 0.4.6

Arraying · Jul 5, 2018 · 752e095 · 752e095
1 parent 421fa72
commit 752e095
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/main/java/de/arraying/kotys/JSONORM.java b/src/main/java/de/arraying/kotys/JSONORM.java
@@ -130,16 +130,25 @@ T mapTo(JSON json, String... ignoredJSONKeys)
             if(!json.has(key)) {
                 continue;
             }
+            Class<?> type = field.getType();
             Object rawValue = json.object(key);
             Object value;
             if(rawValue instanceof JSON) {
-                value = ((JSON) rawValue).marshal(field.getType());
+                if(type.equals(JSON.class)) {
+                    value = rawValue;
+                } else {
+                    value = ((JSON) rawValue).marshal(type);
+                }
             } else if(rawValue instanceof JSONArray) {
-                Class<?> fieldType = field.getType().getComponentType();
-                if(fieldType.isPrimitive()) {
-                    throw new IllegalArgumentException("Array type " + fieldType + " is primitive");
+                if(type.equals(JSONArray.class)) {
+                    value = rawValue;
+                } else {
+                    Class<?> fieldType = type.getComponentType();
+                    if(fieldType.isPrimitive()) {
+                        throw new IllegalArgumentException("Array type " + fieldType + " is primitive");
+                    }
+                    value = ((JSONArray) rawValue).marshal(fieldType);
                 }
-                value = ((JSONArray) rawValue).marshal(fieldType);
             } else {
                 value = rawValue;
             }