make JsonBuilder public and fix ValueMerge change detection

Author: willr3

src/main/java/io/hyperfoil/tools/parse/ExpRule.java

@@ -1,6 +1,6 @@
 package io.hyperfoil.tools.parse;
 
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
+import io.hyperfoil.tools.parse.json.JsonBuilder;
 import io.hyperfoil.tools.yaup.json.Json;
 
 import java.util.List;
@@ -93,6 +93,7 @@ public boolean prePopulate(JsonBuilder builder, List<Object> data){
             break;
          case TargetRoot:
             builder.pushTarget(builder.getRoot(),filteredData.toString()+ Exp.ROOT_TARGET_NAME);
+            changedTarget=true;
             break;
       }
       return changedTarget;

src/main/java/io/hyperfoil/tools/parse/Parser.java

@@ -2,7 +2,7 @@
 
 import io.hyperfoil.tools.parse.factory.ParseFactory;
 import io.hyperfoil.tools.parse.internal.CheatChars;
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
+import io.hyperfoil.tools.parse.json.JsonBuilder;
 import io.hyperfoil.tools.yaup.json.Json;
 
 import java.util.*;

src/main/java/io/hyperfoil/tools/parse/ValueMerge.java

@@ -1,6 +1,6 @@
 package io.hyperfoil.tools.parse;
 
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
+import io.hyperfoil.tools.parse.json.JsonBuilder;
 import io.hyperfoil.tools.yaup.json.Json;
 
 import java.util.concurrent.atomic.AtomicBoolean;

src/main/java/io/hyperfoil/tools/parse/json/JsonBuilder.java

@@ -1,4 +1,4 @@
-package io.hyperfoil.tools.parse.internal;
+package io.hyperfoil.tools.parse.json;
 
 import io.hyperfoil.tools.yaup.json.Json;
 
@@ -150,6 +150,21 @@ public Json popTarget(int count){
 
     public int size(){return targets.size();}
 
+    public Json targetStackJson(){
+        Json rtrn = new Json();
+        for(int i= targets.size()-1; i>0; i--){
+            Json entry = new Json();
+            entry.set("target",targets.get(i).target);
+            entry.set("info",Json.fromMap(targets.get(i).info));
+            if(entry.getJson("info").has(NAME_KEY)){
+                entry.getJson("info").set("name",entry.getJson("info").get(NAME_KEY));
+                entry.getJson("info").remove(NAME_KEY);
+            }
+            rtrn.add(entry);
+        }
+        return rtrn;
+    }
+
     public String debug(boolean recursive){
         StringBuilder sb = new StringBuilder();
         int infoWidth = targets.stream().mapToInt((s)->s.info.toString().length()).max().orElse(2);

src/test/java/io/hyperfoil/tools/parse/factory/JStackFactoryTest.java

@@ -1,22 +1,15 @@
 package io.hyperfoil.tools.parse.factory;
 
 
-import io.hyperfoil.tools.parse.Parser;
-import io.hyperfoil.tools.parse.factory.JStackFactory;
-import io.hyperfoil.tools.parse.reader.TextLineReader;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import io.hyperfoil.tools.parse.Exp;
 import io.hyperfoil.tools.parse.internal.CheatChars;
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
+import io.hyperfoil.tools.parse.json.JsonBuilder;
 import io.hyperfoil.tools.yaup.json.Json;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

src/test/java/io/hyperfoil/tools/parse/factory/WrkFactoryTest.java

@@ -7,7 +7,6 @@
 
 import io.hyperfoil.tools.parse.JsonConsumer;
 import io.hyperfoil.tools.parse.Parser;
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
 import io.hyperfoil.tools.yaup.json.Json;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/io/hyperfoil/tools/parse/factory/XanFactoryTest.java

@@ -2,10 +2,8 @@
 
 import io.hyperfoil.tools.parse.Eat;
 import io.hyperfoil.tools.parse.ExpRule;
-import io.hyperfoil.tools.parse.Parser;
 import io.hyperfoil.tools.parse.internal.CheatChars;
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
-import io.hyperfoil.tools.parse.reader.TextLineReader;
+import io.hyperfoil.tools.parse.json.JsonBuilder;
 import io.hyperfoil.tools.yaup.json.Json;
 import org.junit.Assert;
 import org.junit.Before;

src/test/java/io/hyperfoil/tools/parse/internal/JsonBuilderTest.java

@@ -1,6 +1,6 @@
 package io.hyperfoil.tools.parse.internal;
 
-import io.hyperfoil.tools.parse.internal.JsonBuilder;
+import io.hyperfoil.tools.parse.json.JsonBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 import io.hyperfoil.tools.yaup.json.Json;