Merge pull request #277 from art-community/arrays-bug

Arrays bug

Author: Anton Bashirov

application-entity/src/main/java/ru/art/entity/Entity.java

@@ -792,12 +792,17 @@ public EntityBuilder valueCollectionField(String name, Collection<Value> value)
             return this;
         }
 
+        public EntityBuilder collectionValueField(String name, CollectionValue<?> value) {
+            fields.put(name, value);
+            return this;
+        }
+
         public EntityBuilder stringParametersCollectionField(String name, Collection<StringParametersMap> value) {
             fields.put(name, collectionValue(CollectionElementsType.STRING_PARAMETERS_MAP, value));
             return this;
         }
 
-        public EntityBuilder collectionValueCollectionField(String name, Collection<CollectionValue<?>> value) {
+        public EntityBuilder collectionValueCollectionField(String name, Collection<CollectionValue<Entity>> value) {
             fields.put(name, collectionValue(CollectionElementsType.COLLECTION, value));
             return this;
         }

application-json/src/main/java/ru/art/json/descriptor/JsonEntityReader.java

@@ -154,7 +154,7 @@ private static void parseArray(EntityBuilder entityBuilder, JsonParser parser) t
                 entityBuilder.entityCollectionField(currentName, parseEntityArray(parser));
                 return;
             case START_ARRAY:
-                parseArray(entityBuilder, parser);
+                entityBuilder.collectionValueCollectionField(currentName, parseArraysArray(parser));
                 return;
             case VALUE_STRING:
                 entityBuilder.stringCollectionField(currentName, parseStringArray(parser));
@@ -187,7 +187,7 @@ private static CollectionValue<?> parseArray(JsonParser parser) throws IOExcepti
             case START_OBJECT:
                 return entityCollection(parseEntityArray(parser));
             case START_ARRAY:
-                return parseArray(parser);
+                return collectionOfCollections(parseArraysArray(parser));
             case VALUE_STRING:
                 return stringCollection(parseStringArray(parser));
             case VALUE_NUMBER_INT:
@@ -267,4 +267,14 @@ private static Collection<Entity> parseEntityArray(JsonParser parser) throws IOE
         } while (!parser.isClosed() && currentToken != END_ARRAY);
         return array;
     }
+
+    private Collection<CollectionValue<Entity>> parseArraysArray(JsonParser parser) throws IOException {
+        List<CollectionValue<Entity>> array = dynamicArrayOf();
+        JsonToken currentToken = parser.currentToken();
+        do {
+            if (currentToken != START_ARRAY) array.add(entityCollection(parseEntityArray(parser)));
+            currentToken = parser.nextToken();
+        } while (!parser.isClosed() && currentToken != END_ARRAY);
+        return array;
+    }
 }