Expose created entities after finalizing form

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

@@ -4,6 +4,7 @@
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.IDataReference;
 import org.javarosa.core.model.instance.FormInstance;
+import org.javarosa.core.model.instance.TreeElement;
 import org.javarosa.entities.internal.EntitiesAttachment;
 import org.javarosa.entities.internal.EntityFormParseAttachment;
 import org.javarosa.form.api.FormEntryModel;
@@ -27,7 +28,7 @@ public void processForm(FormEntryModel formEntryModel) {
         String dataset = entityFormParseAttachment.getDataset();
         List<Pair<XPathReference, String>> saveTos = entityFormParseAttachment.getSaveTos();
 
-        if (dataset != null) {
+        if (dataset != null && createIsRelevant(mainInstance)) {
             List<Pair<String, String>> fields = saveTos.stream().map(saveTo -> {
                 IDataReference reference = saveTo.getFirst();
                 String answer = mainInstance.resolveReference(reference).getValue().getDisplayText();
@@ -39,4 +40,25 @@ public void processForm(FormEntryModel formEntryModel) {
             formEntryModel.putAttachment(new EntitiesAttachment(emptyList()));
         }
     }
+
+    private boolean createIsRelevant(FormInstance mainInstance) {
+        TreeElement root = mainInstance.getRoot();
+        List<TreeElement> meta = root.getChildrenWithName("meta");
+        if (!meta.isEmpty()) {
+            List<TreeElement> entity = meta.get(0).getChildrenWithName("entity")
+                .stream()
+                .filter(node -> node.getNamespace().equals("http://www.opendatakit.org/xforms/entities"))
+                .collect(Collectors.toList());
+
+            if (!entity.isEmpty()) {
+                List<TreeElement> create = entity.get(0).getChildrenWithName("create");
+
+                if (!create.isEmpty()) {
+                    return create.get(0).isRelevant();
+                }
+            }
+        }
+
+        return false;
+    }
 }

src/test/java/org/javarosa/xform/parse/EntitiesTest.java

@@ -120,6 +120,47 @@ public void fillingFormWithCreate_makesEntityAvailable() throws IOException {
         assertThat(entities.get(0).fields, equalTo(asList(new Pair<>("name", "Tom Wambsgans"))));
     }
 
+    @Test
+    public void fillingFormWithNonRelevantCreate_doesNotCreateAnyEntities() throws IOException {
+        Scenario scenario = Scenario.init("Create entity form", XFormsElement.html(
+            asList(
+                new Pair<>("entities", "http://www.opendatakit.org/xforms/entities")
+            ),
+            head(
+                title("Create entity form"),
+                model(
+                    mainInstance(
+                        t("data id=\"create-entity-form\"",
+                            t("name"),
+                            t("join"),
+                            t("orx:meta",
+                                t("entities:entity dataset=\"members\"",
+                                    t("entities:create")
+                                )
+                            )
+                        )
+                    ),
+                    bind("/data/orx:meta/entities:entity/entities:create").relevant("/data/join = 'yes'"),
+                    bind("/data/name").type("string").withAttribute("entities", "saveto", "name")
+                )
+            ),
+            body(
+                input("/data/name"),
+                select1("/data/join", item("yes", "Yes"), item("no", "No"))
+            )
+        ));
+
+        scenario.getFormEntryController().addPostProcessor(new EntityFormPostProcessor());
+
+        scenario.next();
+        scenario.answer("Roman Roy");
+        scenario.answer(scenario.choicesOf("/data/join").get(1));
+
+        scenario.finalizeInstance();
+        List<Entity> entities = scenario.getFormEntryController().getModel().getAttachment(EntitiesAttachment.class).getEntities();
+        assertThat(entities.size(), equalTo(0));
+    }
+
     @Test
     public void entityFormCanBeSerialized() throws IOException, DeserializationException {
         Scenario scenario = Scenario.init("Create entity form", XFormsElement.html(