Version 0.4.5

Arraying · Jun 17, 2018 · 421fa72 · 421fa72
1 parent 7454547
commit 421fa72
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.arraying</groupId>
     <artifactId>Kotys</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
     <build>
         <plugins>
             <plugin>

diff --git a/src/main/java/de/arraying/kotys/JSONArray.java b/src/main/java/de/arraying/kotys/JSONArray.java
@@ -3,7 +3,6 @@
 import java.io.StringReader;
 import java.lang.reflect.Array;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Copyright 2017 Arraying
@@ -258,10 +257,18 @@ public final String marshal() {
      */
     @SuppressWarnings("unchecked")
     public final <T> T[] marshal(Class<T> clazz) {
-        List<Object> objects = rawContent
-                .stream()
-                .filter(entry -> entry.getClass().equals(clazz))
-                .collect(Collectors.toList());
+        List<Object> objects = new ArrayList<>();
+        for(Object raw : rawContent) {
+            if(raw instanceof JSON) {
+                try {
+                    objects.add(((JSON) raw).marshal(clazz));
+                } catch(Exception ignored) {}
+            } else {
+                if(raw.getClass().equals(clazz)) {
+                    objects.add(raw);
+                }
+            }
+        }
         Object[] array = (Object[]) Array.newInstance(clazz, objects.size());
         for(int i = 0; i < array.length; i++) {
             array[i] = objects.get(i);

diff --git a/src/main/java/de/arraying/kotys/JSONORM.java b/src/main/java/de/arraying/kotys/JSONORM.java
@@ -135,10 +135,6 @@ T mapTo(JSON json, String... ignoredJSONKeys)
             if(rawValue instanceof JSON) {
                 value = ((JSON) rawValue).marshal(field.getType());
             } else if(rawValue instanceof JSONArray) {
-                JSONArray jsonArray = (JSONArray) rawValue;
-                if(jsonArray.length() == 0) {
-                    continue;
-                }
                 Class<?> fieldType = field.getType().getComponentType();
                 if(fieldType.isPrimitive()) {
                     throw new IllegalArgumentException("Array type " + fieldType + " is primitive");