commons: fix issues related to xml annotations. Several issues are fixed: - Remove name member variables from all classes extending org.eclipse.om2m.commons.obix.Obj class. A member variable called name is defined in Obj class. - Make mandatory the representation tag into org.eclipse.om2m.commons.resource.Notify class - Remove objGroup member variable from org.eclipse.om2m.commons.obix.List class. objGroup member variable is defined in Obj class - Remove href member variable from Ref class. href member variable is defined in Obj class Signed-off-by: BONNARDEL Gregory <gbonnardel.ext@orange.com>
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java index a70392e..8a48020 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java
@@ -40,8 +40,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java index aa30748..b3caf5e 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java
@@ -18,8 +18,6 @@ @XmlAttribute(name = "val") protected Boolean val; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java index 66e19f8..cca019e 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java
@@ -40,8 +40,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java index f1fc4d3..7a6d6e9 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java
@@ -35,8 +35,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java index fa20dce..d3f9496 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java
@@ -16,8 +16,7 @@ @XmlRootElement public class Err extends Obj{ - @XmlAttribute(name = "name") - protected String name; + @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java index b7c228c..cf63d29 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java
@@ -31,8 +31,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java index 1595ed9..24061a0 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java
@@ -20,8 +20,6 @@ @XmlAttribute(name = "val") protected BigInteger val; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java index 456bd80..53d24a0 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java
@@ -16,31 +16,10 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "list", propOrder = { - "objGroup" -}) +@XmlType(name = "list") @XmlRootElement public class List extends Obj{ - @XmlElements({ - @XmlElement(name = "obj", type = Obj.class), - @XmlElement(name = "bool", type = Bool.class), - @XmlElement(name = "int", type = Int.class), - @XmlElement(name = "real", type = Real.class), - @XmlElement(name = "str", type = Str.class), - @XmlElement(name = "enum", type = Enum.class), - @XmlElement(name = "abstime", type = Abstime.class), - @XmlElement(name = "reltime", type = Reltime.class), - @XmlElement(name = "date", type = Date.class), - @XmlElement(name = "time", type = Time.class), - @XmlElement(name = "uri", type = Uri.class), - @XmlElement(name = "list", type = List.class), - @XmlElement(name = "ref", type = Ref.class), - @XmlElement(name = "err", type = Err.class), - @XmlElement(name = "op", type = Op.class), - @XmlElement(name = "feed", type = Feed.class) - }) - protected java.util.List<Object> objGroup; @XmlAttribute(name = "of") protected String of; @XmlAttribute(name = "min") @@ -62,8 +41,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") @@ -107,12 +84,6 @@ * * */ - public java.util.List<Object> getObjGroup() { - if (objGroup == null) { - objGroup = new ArrayList<Object>(); - } - return this.objGroup; - } /** * Obtient la valeur de la propriété of.
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java index ca6349e..5d1e3dc 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java
@@ -21,8 +21,6 @@ protected Contract in; @XmlTransient protected Contract out; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java index fe5e217..34b78ef 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java
@@ -17,8 +17,6 @@ @XmlAttribute(name = "val") protected Double val; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java index b1e1b3d..4e2c040 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java
@@ -31,10 +31,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; - @XmlAttribute(name = "href") - protected String href; @XmlAttribute(name = "null") protected Boolean _null;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java index c1c3d09..6c75729 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java
@@ -23,8 +23,6 @@ @XmlAttribute(name = "max") @XmlSchemaType(name = "time") protected XMLGregorianCalendar max; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java index 1d80cb2..c33bbf6 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java
@@ -37,8 +37,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java index 4467b35..59ee848 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java
@@ -25,8 +25,6 @@ protected XMLGregorianCalendar max; @XmlAttribute(name = "tz") protected String tz; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java index b538b62..33bb51b 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java
@@ -34,8 +34,6 @@ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java index fccb93d..2ac89bc 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java
@@ -69,6 +69,7 @@ @XmlElement(namespace = "http://uri.etsi.org/m2m", required = true) protected StatusCode statusCode; + @XmlElement(required = true) protected Base64Binary representation; @XmlElement(required = true) @XmlSchemaType(name = "anyURI")