Merge "Bug 2517: Catch RuntimeExceptions thrown from the DCL in DataChangeListener"

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / restconf / impl / IdentityValuesDTO.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java
index 4fb75141d5d8e909143c93017727d740921b8a44..248830830e78ca2112817383786d02b0161774f9 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java
@@ -14,44 +14,51 @@ import java.util.List;
 public final class IdentityValuesDTO {
 
     private final List<IdentityValue> elementData = new ArrayList<>();
+    private final String originValue;
 
-    public IdentityValuesDTO(String namespace, String value, String prefix) {
-        elementData.add(new IdentityValue(namespace, value, prefix));
+    public IdentityValuesDTO(final String namespace, final String value, final String prefix, final String originValue) {
+        elementData.add(new IdentityValue(namespace, value));
+        this.originValue = originValue;
     }
-    
+
+    public IdentityValuesDTO(final String originValue) {
+        this.originValue = originValue;
+    }
+
     public IdentityValuesDTO() {
-        
+        originValue = null;
     }
 
-    public void add(String namespace, String value, String prefix) {
-        elementData.add(new IdentityValue(namespace, value, prefix));
+    public void add(final String namespace, final String value, final String prefix) {
+        elementData.add(new IdentityValue(namespace, value));
     }
-    
-    public void add(IdentityValue identityValue) {
+
+    public void add(final IdentityValue identityValue) {
         elementData.add(identityValue);
     }
-    
 
     public List<IdentityValue> getValuesWithNamespaces() {
         return Collections.unmodifiableList(elementData);
     }
-    
+
     @Override
     public String toString() {
         return elementData.toString();
     }
 
+    public String getOriginValue() {
+        return originValue;
+    }
+
     public static final class IdentityValue {
 
         private final String namespace;
         private final String value;
-        private final String prefix;
         private List<Predicate> predicates;
 
-        public IdentityValue(String namespace, String value, String prefix) {
+        public IdentityValue(final String namespace, final String value) {
             this.namespace = namespace;
             this.value = value;
-            this.prefix = prefix;
         }
 
         public String getNamespace() {
@@ -62,9 +69,6 @@ public final class IdentityValuesDTO {
             return value;
         }
 
-        public String getPrefix() {
-            return prefix;
-        }
 
         public List<Predicate> getPredicates() {
             if (predicates == null) {
@@ -73,24 +77,21 @@ public final class IdentityValuesDTO {
             return Collections.unmodifiableList(predicates);
         }
 
-        public void setPredicates(List<Predicate> predicates) {
+        public void setPredicates(final List<Predicate> predicates) {
             this.predicates = predicates;
         }
-        
+
         @Override
         public String toString() {
-            StringBuilder sb = new StringBuilder();
+            final StringBuilder sb = new StringBuilder();
             if (namespace != null) {
                 sb.append(namespace);
             }
-            if (prefix != null) {
-                sb.append("(").append(prefix).append(")");
-            }
             if (value != null) {
                 sb.append(" - ").append(value);
             }
             if (predicates != null && !predicates.isEmpty()) {
-                for (Predicate predicate : predicates) {
+                for (final Predicate predicate : predicates) {
                     sb.append("[");
                     predicate.toString();
                     sb.append("]");
@@ -100,29 +101,29 @@ public final class IdentityValuesDTO {
         }
 
     }
-    
+
     public static final class Predicate {
-        
+
         private final IdentityValue name;
         private final String value;
-        
-        public Predicate(IdentityValue name, String value) {
+
+        public Predicate(final IdentityValue name, final String value) {
             super();
             this.name = name;
             this.value = value;
         }
-        
+
         public IdentityValue getName() {
             return name;
         }
-        
+
         public String getValue() {
             return value;
         }
 
         @Override
         public String toString() {
-            StringBuilder sb = new StringBuilder();
+            final StringBuilder sb = new StringBuilder();
             if (name != null) {
                 sb.append(name.toString());
             }
@@ -131,10 +132,10 @@ public final class IdentityValuesDTO {
             }
             return sb.toString();
         }
-        
+
         public boolean isLeafList() {
             return name == null ? true : false;
         }
-        
+
     }
 }