Expose created entities after finalizing form

src/main/java/org/javarosa/entities/UnrecognizedEntityVersionException.java

@@ -0,0 +1,6 @@
+package org.javarosa.entities;
+
+import org.javarosa.xform.parse.XFormParseException;
+
+public class UnrecognizedEntityVersionException extends XFormParseException {
+}

src/main/java/org/javarosa/entities/internal/EntityFormParseProcessor.java

@@ -3,30 +3,55 @@
 import kotlin.Pair;
 import org.javarosa.core.model.DataBinding;
 import org.javarosa.core.model.FormDef;
+import org.javarosa.core.model.instance.FormInstance;
+import org.javarosa.core.model.instance.TreeElement;
+import org.javarosa.entities.UnrecognizedEntityVersionException;
 import org.javarosa.model.xform.XPathReference;
+import org.javarosa.xform.parse.XFormParseException;
 import org.javarosa.xform.parse.XFormParser;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class EntityFormParseProcessor implements XFormParser.BindAttributeProcessor, XFormParser.FormDefProcessor {
+public class EntityFormParseProcessor implements XFormParser.BindAttributeProcessor, XFormParser.FormDefProcessor, XFormParser.ModelAttributeProcessor {
 
     private static final String ENTITIES_NAMESPACE = "http://www.opendatakit.org/xforms/entities";
+    public static final String SUPPORTED_VERSION = "v2022.1";
 
     private final List<Pair<XPathReference, String>> saveTos = new ArrayList<>();
 
     @Override
-    public Set<Pair<String, String>> getUsedAttributes() {
+    public Set<Pair<String, String>> getUsedModelAttributes() {
+        HashSet<Pair<String, String>> attributes = new HashSet<>();
+        attributes.add(new Pair<>(ENTITIES_NAMESPACE, "entities-version"));
+
+        return attributes;
+    }
+
+    @Override
+    public void processModelAttribute(String name, String value) throws XFormParseException {
+        try {
+            String[] versionParts = value.split("\\.");
+            if (!SUPPORTED_VERSION.equals(versionParts[0] + "." + versionParts[1])) {
+                throw new UnrecognizedEntityVersionException();
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw new UnrecognizedEntityVersionException();
+        }
+    }
+
+    @Override
+    public Set<Pair<String, String>> getUsedBindAttributes() {
         HashSet<Pair<String, String>> attributes = new HashSet<>();
         attributes.add(new Pair<>(ENTITIES_NAMESPACE, "saveto"));
 
         return attributes;
     }
 
     @Override
-    public void processBindingAttribute(String name, String value, DataBinding binding) {
+    public void processBindAttribute(String name, String value, DataBinding binding) {
         saveTos.add(new Pair<>((XPathReference) binding.getReference(), value));
     }
 

src/main/java/org/javarosa/xform/parse/StandardBindAttributesProcessor.java

@@ -122,15 +122,15 @@ DataBinding createBinding(IXFormParserFunctions parserFunctions, FormDef formDef
                 String namespace = element.getAttributeNamespace(i);
                 String name = element.getAttributeName(i);
 
-                if (bindAttributeProcessor.getUsedAttributes().contains(new Pair<>(namespace, name))) {
-                    bindAttributeProcessor.processBindingAttribute(name, element.getAttributeValue(i), binding);
+                if (bindAttributeProcessor.getUsedBindAttributes().contains(new Pair<>(namespace, name))) {
+                    bindAttributeProcessor.processBindAttribute(name, element.getAttributeValue(i), binding);
                 }
             }
         });
 
         List<String> processorAttributes = bindAttributeProcessors.stream()
             .flatMap((Function<XFormParser.BindAttributeProcessor, Stream<String>>) bindAttributeProcessor -> {
-                return bindAttributeProcessor.getUsedAttributes().stream().map(Pair::getSecond);
+                return bindAttributeProcessor.getUsedBindAttributes().stream().map(Pair::getSecond);
             })
             .collect(Collectors.toList());
 

src/main/java/org/javarosa/xform/parse/XFormParser.java

@@ -177,6 +177,7 @@ public class XFormParser implements IXFormParserFunctions {
 
     private final List<BindAttributeProcessor> bindAttributeProcessors = new ArrayList<>();
     private final List<FormDefProcessor> formDefProcessors = new ArrayList<>();
+    private final List<ModelAttributeProcessor> modelAttributeProcessors = new ArrayList<>();
 
     /**
      * The string IDs of all instances that are referenced in a instance() function call in the primary instance
@@ -413,6 +414,10 @@ public void addProcessor(Processor processor) {
         if (processor instanceof FormDefProcessor) {
             addFormDefProcessor((FormDefProcessor) processor);
         }
+
+        if (processor instanceof ModelAttributeProcessor) {
+            addModelAttributeProcessor((ModelAttributeProcessor) processor);
+        }
     }
 
     public void addBindAttributeProcessor(BindAttributeProcessor bindAttributeProcessor) {
@@ -423,6 +428,10 @@ public void addFormDefProcessor(FormDefProcessor formDefProcessor) {
         formDefProcessors.add(formDefProcessor);
     }
 
+    public void addModelAttributeProcessor(ModelAttributeProcessor modelAttributeProcessor) {
+        modelAttributeProcessors.add(modelAttributeProcessor);
+    }
+
     /**
      * Extracts the namespaces from the given element and creates a map of URI to prefix
      */
@@ -673,7 +682,19 @@ private void parseMeta(Element e) {
     }
 
     //for ease of parsing, we assume a model comes before the controls, which isn't necessarily mandated by the xforms spec
-    private void parseModel(Element e) {
+    private void parseModel(Element e) throws XFormParseException {
+        modelAttributeProcessors.stream().forEach(processor -> {
+            for (int i = 0; i < e.getAttributeCount(); i++) {
+                String namespace = e.getAttributeNamespace(i);
+                String name = e.getAttributeName(i);
+                String value = e.getAttributeValue(i);
+
+                if (processor.getUsedModelAttributes().contains(new Pair<>(namespace, name))) {
+                    processor.processModelAttribute(name, value);
+                }
+            }
+        });
+
         List<String> usedAtts = new ArrayList<>(); //no attributes parsed in title.
         List<Element> delayedParseElements = new ArrayList<>();
 
@@ -2405,8 +2426,15 @@ public interface FormDefProcessor extends Processor {
 
     public interface BindAttributeProcessor extends Processor {
 
-        Set<Pair<String, String>> getUsedAttributes();
+        Set<Pair<String, String>> getUsedBindAttributes();
+
+        void processBindAttribute(String name, String value, DataBinding binding);
+    }
+
+    public interface ModelAttributeProcessor extends Processor {
+
+        Set<Pair<String, String>> getUsedModelAttributes();
 
-        void processBindingAttribute(String name, String value, DataBinding binding);
+        void processModelAttribute(String name, String value) throws XFormParseException;
     }
 }

src/test/java/org/javarosa/entities/internal/EntityFormParseProcessorTest.java

@@ -3,6 +3,7 @@
 import kotlin.Pair;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.util.XFormsElement;
+import org.javarosa.entities.UnrecognizedEntityVersionException;
 import org.javarosa.xform.parse.XFormParser;
 import org.junit.Test;
 
@@ -25,6 +26,76 @@
 
 public class EntityFormParseProcessorTest {
 
+    @Test(expected = UnrecognizedEntityVersionException.class)
+    public void whenVersionIsNotRecognized_throwsException() throws IOException {
+        XFormsElement form = XFormsElement.html(
+            asList(
+                new Pair<>("entities", "http://www.opendatakit.org/xforms/entities")
+            ),
+            head(
+                title("Create entity form"),
+                t("model entities:entities-version=\"somethingElse\"",
+                    mainInstance(
+                        t("data id=\"create-entity-form\"",
+                            t("name"),
+                            t("orx:meta",
+                                t("entities:entity dataset=\"people\"",
+                                    t("entities:create")
+                                )
+                            )
+                        )
+                    ),
+                    bind("/data/name").type("string").withAttribute("entities", "saveto", "name")
+                )
+            ),
+            body(
+                input("/data/name")
+            )
+        );
+
+        EntityFormParseProcessor processor = new EntityFormParseProcessor();
+
+        XFormParser parser = new XFormParser(new InputStreamReader(new ByteArrayInputStream(form.asXml().getBytes())));
+        parser.addProcessor(processor);
+        parser.parse(null);
+    }
+
+    @Test
+    public void whenVersionIsNewPatch_doesNotThrowException() throws IOException {
+        String newPatchVersion = EntityFormParseProcessor.SUPPORTED_VERSION + ".12";
+
+        XFormsElement form = XFormsElement.html(
+            asList(
+                new Pair<>("entities", "http://www.opendatakit.org/xforms/entities")
+            ),
+            head(
+                title("Create entity form"),
+                t("model entities:entities-version=\"" + newPatchVersion + "\"",
+                    mainInstance(
+                        t("data id=\"create-entity-form\"",
+                            t("name"),
+                            t("orx:meta",
+                                t("entities:entity dataset=\"people\"",
+                                    t("entities:create")
+                                )
+                            )
+                        )
+                    ),
+                    bind("/data/name").type("string").withAttribute("entities", "saveto", "name")
+                )
+            ),
+            body(
+                input("/data/name")
+            )
+        );
+
+        EntityFormParseProcessor processor = new EntityFormParseProcessor();
+
+        XFormParser parser = new XFormParser(new InputStreamReader(new ByteArrayInputStream(form.asXml().getBytes())));
+        parser.addProcessor(processor);
+        parser.parse(null);
+    }
+
     @Test
     public void saveTosWithIncorrectNamespaceAreIgnored() throws IOException {
         XFormsElement form = XFormsElement.html(