Merge pull request #391 from rapiddweller/5-enrich-entity-with-parts-…

…objects-list-subentities-when-iterating-over-json-file Enrich entity with part while iterating json file
rapiddweller · Apr 25, 2023 · 0aa7a06 · 0aa7a06
2 parents 01ca5bc + d112a5e
commit 0aa7a06
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/rapiddweller/benerator/composite/PartModifier.java b/src/main/java/com/rapiddweller/benerator/composite/PartModifier.java
@@ -6,6 +6,7 @@
 import com.rapiddweller.benerator.factory.BeneratorExceptionFactory;
 import com.rapiddweller.benerator.wrapper.ProductWrapper;
 import com.rapiddweller.common.ArrayUtil;
+import com.rapiddweller.model.data.ComplexTypeDescriptor;
 import com.rapiddweller.model.data.Entity;
 
 import java.util.Collection;
@@ -58,9 +59,12 @@ public boolean execute(BeneratorContext context) {
     ProductWrapper<?> wrapper = context.getCurrentProduct();
     if (wrapper != null) {
       Object part = ((Entity) wrapper.unwrap()).getComponent(partName);
-      if (part != null) {
-        applyToPart(part, context);
+      // Init part and add into currentProduct
+      if (part == null) {
+        part = new Entity((ComplexTypeDescriptor) null, null);
+        ((Entity)context.getCurrentProduct().unwrap()).setComponent(partName, part);
       }
+      applyToPart(part, context);
     }
     return true;
   }

diff --git a/src/main/java/com/rapiddweller/model/data/Entity.java b/src/main/java/com/rapiddweller/model/data/Entity.java
@@ -67,8 +67,10 @@ public Entity(String name, DescriptorProvider descriptorProvider, Object... comp
   public Entity(ComplexTypeDescriptor descriptor, Object... componentKeyValuePairs) {
     this.descriptor = descriptor;
     this.components = BeneratorFactory.getInstance().createComponentMap();
-    for (int i = 0; i < componentKeyValuePairs.length; i += 2) {
-      setComponent((String) componentKeyValuePairs[i], componentKeyValuePairs[i + 1]);
+    if (componentKeyValuePairs != null) {
+      for (int i = 0; i < componentKeyValuePairs.length; i += 2) {
+        setComponent((String) componentKeyValuePairs[i], componentKeyValuePairs[i + 1]);
+      }
     }
   }