X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FDescription.java;h=2e3707416a0fccd5636be5e53ddecd3b73cc3e5c;hp=4138aa6c34068038c72ae97e9f8f5658a6b1211b;hb=9303b14b9dba1a940f0d0a6fe1604bfcd0f9e294;hpb=dc187ab6e2bfb66e1ded9d514ab647877b051931 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..2e3707416a 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,14 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ 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 +17,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 +28,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 +50,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 +63,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; } }