Expose created entities after finalizing form

src/jmh/java/org/javarosa/benchmarks/ChildVaccinationBenchmark.java

@@ -38,6 +38,7 @@
 import java.util.function.Consumer;
 import org.javarosa.core.model.instance.TreeReference;
 import org.javarosa.core.test.Scenario;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -65,7 +66,7 @@ public static class ChildVaccinationState {
         private List<TreeReference> endOfVisitRefs;
 
         @Setup(Level.Trial)
-        public void initialize() {
+        public void initialize() throws XFormParser.ParseException {
             Path formFile = prepareAssets("child_vaccination_VOL_tool_v12.xml").resolve("child_vaccination_VOL_tool_v12.xml");
             vaccinationPenta1Ref = getRef("/data/household/child_repeat/penta1");
             vaccinationPenta3Ref = getRef("/data/household/child_repeat/penta3");

src/jmh/java/org/javarosa/benchmarks/FormDefCacheExternal2ndryInstanceBenchmark.java

@@ -7,6 +7,7 @@
 import org.javarosa.core.util.JavaRosaCoreModule;
 import org.javarosa.model.xform.XFormsModule;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -33,7 +34,7 @@ public static class FormDefCacheState {
 
         @Setup(Level.Trial)
         public void
-        initialize() throws IOException {
+        initialize() throws IOException, XFormParser.ParseException {
             resourcePath = BenchmarkUtils.getNigeriaWardsXMLWithExternal2ndryInstance();
             formDef = FormParserHelper.parse(resourcePath);
             cachePath = getCachePath().toString();

src/jmh/java/org/javarosa/benchmarks/FormDefCacheInternal2ndryInstanceBenchmark.java

@@ -7,6 +7,7 @@
 import org.javarosa.core.util.JavaRosaCoreModule;
 import org.javarosa.model.xform.XFormsModule;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -32,7 +33,7 @@ public static class FormDefCacheState {
         FormDef formDef;
         @Setup(Level.Trial)
         public void
-        initialize() throws IOException {
+        initialize() throws IOException, XFormParser.ParseException {
             resourcePath = BenchmarkUtils.getNigeriaWardsXMLWithExternal2ndryInstance();
             formDef = FormParserHelper.parse(resourcePath);
             cachePath = getCachePath().toString();

src/jmh/java/org/javarosa/benchmarks/FormDefValidateBenchmark.java

@@ -15,6 +15,7 @@
 import org.javarosa.form.api.FormEntryModel;
 import org.javarosa.form.api.FormEntryPrompt;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -32,7 +33,7 @@ public static class FormDefValidateState {
         FormDef formDef;
 
         @Setup(Level.Trial)
-        public void initialize() throws IOException {
+        public void initialize() throws IOException, XFormParser.ParseException {
             Path resourcePath = BenchmarkUtils.getNigeriaWardsXMLWithExternal2ndryInstance();
             formDef = FormParserHelper.parse(resourcePath);
             FormEntryModel formEntryModel = new FormEntryModel(formDef);

src/jmh/java/org/javarosa/benchmarks/FormEntryControllerAnswerQuestion.java

@@ -16,6 +16,7 @@
 import org.javarosa.form.api.FormEntryModel;
 import org.javarosa.form.api.FormEntryPrompt;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -33,7 +34,7 @@ public static class FormControllerAnswerQuestionState {
         FormEntryModel formEntryModel;
 
         @Setup(Level.Trial)
-        public void initialize() throws IOException {
+        public void initialize() throws IOException, XFormParser.ParseException {
             Path formFile = BenchmarkUtils.getNigeriaWardsXMLWithExternal2ndryInstance();
             FormDef formDef = FormParserHelper.parse(formFile);
             formEntryModel = new FormEntryModel(formDef);

src/jmh/java/org/javarosa/benchmarks/FormParserHelperParseExternalInstanceBenchmark.java

@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -30,7 +31,7 @@ public void initialize() {
 
     @Benchmark
     public void
-    benchmarkParseExternalSecondaryInstance(FormParserHelperParseExternalInstanceBenchmarkState state, Blackhole bh) throws IOException {
+    benchmarkParseExternalSecondaryInstance(FormParserHelperParseExternalInstanceBenchmarkState state, Blackhole bh) throws IOException, XFormParser.ParseException {
         bh.consume(FormParserHelper.parse(state.xFormFilePath));
     }
 

src/jmh/java/org/javarosa/benchmarks/FormParserHelperParseInternalInstanceBenchmark.java

@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -30,7 +31,7 @@ public void initialize() {
 
     @Benchmark
     public void
-    benchmarkParseInternalSecondaryInstanceForm(FormParserHelperParseInternalInstanceBenchmarkState state, Blackhole bh) throws IOException {
+    benchmarkParseInternalSecondaryInstanceForm(FormParserHelperParseInternalInstanceBenchmarkState state, Blackhole bh) throws IOException, XFormParser.ParseException {
         bh.consume(FormParserHelper.parse(state.xFormFilePath));
     }
 }

src/jmh/java/org/javarosa/benchmarks/FormParserHelperParseInternalInstanceMinifiedBenchmark.java

@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import org.javarosa.xform.parse.FormParserHelper;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -30,7 +31,7 @@ public void initialize() {
 
     @Benchmark
     public void
-    benchmarkParseInternalInstanceFormMinified(FormParserHelperParseInternalInstanceMinifiedBenchmarkState state, Blackhole bh) throws IOException {
+    benchmarkParseInternalInstanceFormMinified(FormParserHelperParseInternalInstanceMinifiedBenchmarkState state, Blackhole bh) throws IOException, XFormParser.ParseException {
         bh.consume(FormParserHelper.parse(state.xFormFilePath));
     }
 

src/jmh/java/org/javarosa/benchmarks/PopulateTreeNodeBenchmark.java

@@ -34,7 +34,7 @@ public static class TreeElementPopulateState {
         private FormDef formDef;
 
         @Setup(Level.Trial)
-        public void initialize() throws IOException {
+        public void initialize() throws IOException, XFormParser.ParseException {
             Path assetsDir = prepareAssets("nigeria_wards_external_combined.xml", "wards.xml", "lgas.xml", "populate-nodes-attributes-instance.xml");
             Path formFile = assetsDir.resolve("nigeria_wards_external_combined.xml");
             Path submissionFile = assetsDir.resolve("populate-nodes-attributes-instance.xml");

src/jmh/java/org/javarosa/benchmarks/WhoVaBenchmark.java

@@ -24,6 +24,7 @@
 import java.time.LocalDate;
 import java.util.stream.IntStream;
 import org.javarosa.core.test.Scenario;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -42,7 +43,7 @@ public static class WhoVaState {
         public Scenario scenario;
 
         @Setup(Level.Trial)
-        public void initialize() {
+        public void initialize() throws XFormParser.ParseException {
             scenario = init(prepareAssets("whova_form.xml").resolve("whova_form.xml"));
         }
     }

src/jmh/java/org/javarosa/benchmarks/core/model/CreateRepeatDagBenchmark.java

@@ -15,6 +15,7 @@
 
 import java.io.IOException;
 import org.javarosa.core.test.Scenario;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
@@ -46,7 +47,7 @@ public static class ExecutionPlan {
         Scenario expressionInsideWithPositionCallScenario;
 
         @Setup(Level.Invocation)
-        public void setUp() throws IOException {
+        public void setUp() throws IOException, XFormParser.ParseException {
             expressionInsideScenario = getExpressionInsideScenario();
             expressionInsideWithRefOutsideScenario = getExpressionInsideWithRefOutsideScenario();
             sumExpressionOutsideScenario = getSumExpressionOutsideScenario();
@@ -95,7 +96,7 @@ public void createRepeat_withPositionExpression(ExecutionPlan plan, Blackhole bh
         });
     }
 
-    static Scenario getExpressionInsideScenario() throws IOException {
+    static Scenario getExpressionInsideScenario() throws IOException, XFormParser.ParseException {
         return Scenario.init("Repeat with expression inside", html(
             head(
                 title("Repeat with expression inside"),
@@ -117,7 +118,7 @@ static Scenario getExpressionInsideScenario() throws IOException {
             )));
     }
 
-    static Scenario getExpressionInsideWithRefOutsideScenario() throws IOException {
+    static Scenario getExpressionInsideWithRefOutsideScenario() throws IOException, XFormParser.ParseException {
         return Scenario.init("Repeat with expression inside referencing outside", html(
             head(
                 title("Repeat with expression inside referencing outside"),
@@ -139,7 +140,7 @@ static Scenario getExpressionInsideWithRefOutsideScenario() throws IOException {
             )));
     }
 
-    static Scenario getSumExpressionOutsideScenario() throws IOException {
+    static Scenario getSumExpressionOutsideScenario() throws IOException, XFormParser.ParseException {
         return Scenario.init("Repeat with sum expression outside", html(
             head(
                 title("Repeat with sum expression outside"),
@@ -161,7 +162,7 @@ static Scenario getSumExpressionOutsideScenario() throws IOException {
             )));
     }
 
-    static Scenario getExpressionInsideWithPositionCallScenario() throws IOException {
+    static Scenario getExpressionInsideWithPositionCallScenario() throws IOException, XFormParser.ParseException {
         return Scenario.init("Repeat with expression inside referencing outside", html(
             head(
                 title("Repeat with expression inside referencing outside"),

src/jmh/java/org/javarosa/benchmarks/core/model/DeleteRepeatDagBenchmark.java

@@ -9,6 +9,7 @@
 
 import java.io.IOException;
 import org.javarosa.core.test.Scenario;
+import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
@@ -40,7 +41,7 @@ public static class ExecutionPlan {
         Scenario expressionInsideWithPositionCallScenario;
 
         @Setup(Level.Invocation)
-        public void setUp() throws IOException {
+        public void setUp() throws IOException, XFormParser.ParseException {
             expressionInsideScenario = getExpressionInsideScenario();
             range(0, repeatCount).forEach(n -> {
                 expressionInsideScenario.next();

src/main/java/org/javarosa/core/model/FormDef.java

@@ -16,19 +16,6 @@
 
 package org.javarosa.core.model;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
 import org.javarosa.core.log.WrappedException;
 import org.javarosa.core.model.TriggerableDag.EventNotifierAccessor;
 import org.javarosa.core.model.actions.ActionController;
@@ -55,12 +42,15 @@
 import org.javarosa.core.services.locale.Localizer;
 import org.javarosa.core.services.storage.IMetaData;
 import org.javarosa.core.services.storage.Persistable;
+import org.javarosa.core.util.Extras;
 import org.javarosa.core.util.externalizable.DeserializationException;
 import org.javarosa.core.util.externalizable.ExtUtil;
 import org.javarosa.core.util.externalizable.ExtWrapListPoly;
 import org.javarosa.core.util.externalizable.ExtWrapMap;
 import org.javarosa.core.util.externalizable.ExtWrapNullable;
 import org.javarosa.core.util.externalizable.ExtWrapTagged;
+import org.javarosa.core.util.externalizable.Externalizable;
+import org.javarosa.core.util.externalizable.ExternalizableExtras;
 import org.javarosa.core.util.externalizable.PrototypeFactory;
 import org.javarosa.debug.EvaluationResult;
 import org.javarosa.debug.Event;
@@ -75,6 +65,22 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import static java.util.Collections.emptyList;
+
 /**
  * Definition of a form. This has some meta data about the form definition and a
  * collection of groups together with question branching or skipping rules.
@@ -89,6 +95,7 @@ public class FormDef implements IFormElement, Localizable, Persistable, IMetaDat
     public static final int TEMPLATING_RECURSION_LIMIT = 10;
 
     private static EventNotifier defaultEventNotifier = new EventNotifierSilent();
+    private ExternalizableExtras extras = new ExternalizableExtras();
 
     /**
      * Takes a (possibly relative) reference, and makes it absolute based on its parent.
@@ -1002,9 +1009,9 @@ public void preloadInstance(TreeElement node) {
         // }
     }
 
-    public boolean postProcessInstance() {
+    public void postProcessInstance() {
         actionController.triggerActionsFromEvent(Actions.EVENT_XFORMS_REVALIDATE, elementsWithActionTriggeredByToplevelEvent, this);
-        return postProcessInstance(mainInstance.getRoot());
+        postProcessInstance(mainInstance.getRoot());
     }
 
     /**
@@ -1112,6 +1119,8 @@ public void readExternal(DataInputStream dis, PrototypeFactory pf) throws IOExce
 
         List<TreeReference> treeReferencesWithActions = (List<TreeReference>) ExtUtil.read(dis, new ExtWrapListPoly(), pf);
         elementsWithActionTriggeredByToplevelEvent = getElementsFromReferences(treeReferencesWithActions);
+
+        extras = (ExternalizableExtras) ExtUtil.read(dis, ExternalizableExtras.class);
     }
 
     /**
@@ -1215,6 +1224,8 @@ public void writeExternal(DataOutputStream dos) throws IOException {
         ExtUtil.write(dos, new ExtWrapNullable(actionController));
         ExtUtil.write(dos, new ExtWrapListPoly(new ArrayList<>(actions)));
         ExtUtil.write(dos, new ExtWrapListPoly(getReferencesFromElements(elementsWithActionTriggeredByToplevelEvent)));
+
+        ExtUtil.write(dos, extras);
     }
 
     /**
@@ -1600,7 +1611,7 @@ public String getAdditionalAttribute(String namespace, String name) {
     @Override
     public List<TreeElement> getAdditionalAttributes() {
         // Not supported.
-        return Collections.emptyList();
+        return emptyList();
     }
 
     public <X extends XFormExtension> X getExtension(Class<X> extension) {
@@ -1690,4 +1701,8 @@ private String getFormXmlPath() {
     public HashMap<String, DataInstance> getFormInstances() {
         return formInstances;
     }
+
+    public Extras<Externalizable> getExtras() {
+        return extras;
+    }
 }

src/main/java/org/javarosa/core/model/instance/AbstractTreeElement.java

@@ -6,6 +6,7 @@
 import org.javarosa.core.model.data.IAnswerData;
 import org.javarosa.core.model.instance.utils.ITreeVisitor;
 import org.javarosa.xpath.expr.XPathExpression;
+import org.jetbrains.annotations.Nullable;
 
 public interface AbstractTreeElement<T extends AbstractTreeElement> {
 
@@ -15,6 +16,13 @@ public interface AbstractTreeElement<T extends AbstractTreeElement> {
 
     public abstract String getInstanceName();
 
+    @Nullable
+    public T getFirstChild(String name);
+
+    @Nullable
+    public T getFirstChild(String namespace, String name);
+
+    @Nullable
     public abstract T getChild(String name, int multiplicity);
 
     /**