Merge "BUG-2329 Add test for anyxmls inside rpc resonse for netcfon-connector"

[controller.git] / opendaylight / sal / api / src / main / java / org / opendaylight / controller / sal / core / Latency.java

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java
index 818002a21e042f87da32f5e14573e1b502ffc328..dbe12a1e0d2fca604981f65c77b855cb40d6677c 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java
@@ -9,6 +9,8 @@
 
 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;
 
@@ -20,10 +22,11 @@ import javax.xml.bind.annotation.XmlRootElement;
  * Describe a latency in picoseconds or multiple of its.
  */
 @XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
 public class Latency extends Property {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement
+    @XmlElement(name="value")
     private long latencyValue;
 
     public static final long LATENCYUNK = 0;
@@ -61,6 +64,7 @@ public class Latency extends Property {
         this.latencyValue = (long) latency;
     }
 
+    @Override
     public Latency clone() {
         return new Latency(this.latencyValue);
     }
@@ -99,16 +103,33 @@ public class Latency extends Property {
         if (this.latencyValue == 0) {
             sb.append("UnKnown");
         } else if (this.latencyValue < LATENCY1ns) {
-            sb.append(this.latencyValue + "psec");
+            sb.append(this.latencyValue).append("psec");
         } else if (this.latencyValue < LATENCY1us) {
-            sb.append(Long.toString(this.latencyValue / LATENCY1ns) + "nsec");
+            sb.append(Long.toString(this.latencyValue / LATENCY1ns)).append("nsec");
         } else if (this.latencyValue < LATENCY1ms) {
-            sb.append(Long.toString(this.latencyValue / LATENCY1us) + "usec");
+            sb.append(Long.toString(this.latencyValue / LATENCY1us)).append("usec");
         } else if (this.latencyValue < LATENCY1s) {
-            sb.append(Long.toString(this.latencyValue / LATENCY1ms) + "msec");
+            sb.append(Long.toString(this.latencyValue / LATENCY1ms)).append("msec");
         }
 
         sb.append("]");
         return sb.toString();
     }
+
+    @Override
+    public String getStringValue() {
+        if (this.latencyValue == 0) {
+            return("UnKnown");
+        } else if (this.latencyValue < LATENCY1ns) {
+            return(this.latencyValue + "psec");
+        } else if (this.latencyValue < LATENCY1us) {
+            return(Long.toString(this.latencyValue / LATENCY1ns) + "nsec");
+        } else if (this.latencyValue < LATENCY1ms) {
+            return(Long.toString(this.latencyValue / LATENCY1us) + "usec");
+        } else if (this.latencyValue < LATENCY1s) {
+            return(Long.toString(this.latencyValue / LATENCY1ms) + "msec");
+        } else {
+            return Long.toString(this.latencyValue) + "sec";
+        }
+    }
 }