Merge pull request #50 from openEHR/make_root_element

Add @XmlRootElement annotations to some data structures
openEHR · Sep 10, 2018 · 37be157 · 37be157
2 parents 4871c66 + 6575c80
commit 37be157
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Element.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Element.java
@@ -5,10 +5,7 @@
 import com.nedap.archie.rm.datavalues.SingleValuedDataValue;
 
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.*;
 
 /**
  * Created by pieter.bos on 04/11/15.
@@ -18,6 +15,7 @@
         "value",
         "nullFlavour"
 })
+@XmlRootElement(name="element")
 public class Element extends Item implements SingleValuedDataValue<DataValue> {
 
     @Nullable

diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemList.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemList.java
@@ -3,6 +3,7 @@
 import javax.annotation.Nullable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +15,7 @@
 @XmlType(name = "ITEM_LIST", propOrder = {
     "items"
 })
+@XmlRootElement(name="item_list")
 public class ItemList extends ItemStructure<Element> {
 
     @Nullable

diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTable.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTable.java
@@ -3,6 +3,7 @@
 import javax.annotation.Nullable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +15,7 @@
 @XmlType(name = "ITEM_TABLE", propOrder = {
         "rows"
 })
+@XmlRootElement(name="item_table")
 public class ItemTable extends ItemStructure<Element> {
 
     @Nullable