X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FDescription.java;h=88ab11b354341ac4a4888442611173cdc7e66850;hb=43767bb962ade9659c8aa7eb0e02d412a7a54db2;hp=4138aa6c34068038c72ae97e9f8f5658a6b1211b;hpb=b9fa6d0bbeb3797b0752f059441a6f3966043762;p=controller.git diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java index 4138aa6c34..88ab11b354 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java @@ -1,5 +1,7 @@ package org.opendaylight.controller.sal.core; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -8,9 +10,10 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement @SuppressWarnings("serial") +@XmlAccessorType(XmlAccessType.NONE) public class Description extends Property { - @XmlElement - private String description; + @XmlElement(name="value") + private String descriptionValue; public static final String propertyName = "description"; /* @@ -18,20 +21,21 @@ public class Description extends Property { */ private Description() { super(propertyName); - this.description = null; + this.descriptionValue = null; } public Description(String description) { super(propertyName); - this.description = description; + this.descriptionValue = description; } + @Override public Description clone() { - return new Description(this.description); + return new Description(this.descriptionValue); } public String getValue() { - return this.description; + return this.descriptionValue; } @Override @@ -39,7 +43,7 @@ public class Description extends Property { final int prime = 31; int result = super.hashCode(); result = prime * result - + ((description == null) ? 0 : description.hashCode()); + + ((descriptionValue == null) ? 0 : descriptionValue.hashCode()); return result; } @@ -52,16 +56,21 @@ public class Description extends Property { if (getClass() != obj.getClass()) return false; Description other = (Description) obj; - if (description == null) { - if (other.description != null) + if (descriptionValue == null) { + if (other.descriptionValue != null) return false; - } else if (!description.equals(other.description)) + } else if (!descriptionValue.equals(other.descriptionValue)) return false; return true; } @Override public String toString() { - return "Description[" + description + "]"; + return "Description[" + descriptionValue + "]"; + } + + @Override + public String getStringValue() { + return descriptionValue; } }