X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FIdentityValuesDTO.java;h=5fd36cb19681323f695445c43a6542ccc5866826;hb=730db233aa71642f0aa8a70f30fcd5bbbbbabac9;hp=6924fb620f17d21d9734fc4ade3faf1bf9977c67;hpb=d468a5db1e6fe2c3949d3f6227c0645c6777ecb5;p=controller.git

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 6924fb620f..5fd36cb196 100644
--- 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
@@ -11,20 +11,35 @@ public final class IdentityValuesDTO {
     public IdentityValuesDTO(String namespace, String value, String prefix) {
         elementData.add(new IdentityValue(namespace, value, prefix));
     }
+    
+    public IdentityValuesDTO() {
+        
+    }
 
     public void add(String namespace, String value, String prefix) {
         elementData.add(new IdentityValue(namespace, value, prefix));
     }
+    
+    public void add(IdentityValue identityValue) {
+        elementData.add(identityValue);
+    }
+    
 
     public List<IdentityValue> getValuesWithNamespaces() {
         return Collections.unmodifiableList(elementData);
     }
+    
+    @Override
+    public String toString() {
+        return elementData.toString();
+    }
 
     public static final class IdentityValue {
 
-        private String namespace;
-        private String value;
-        private String prefix;
+        private final String namespace;
+        private final String value;
+        private final String prefix;
+        private List<Predicate> predicates;
 
         public IdentityValue(String namespace, String value, String prefix) {
             this.namespace = namespace;
@@ -36,25 +51,83 @@ public final class IdentityValuesDTO {
             return namespace;
         }
 
-        public void setNamespace(String namespace) {
-            this.namespace = namespace;
-        }
-
         public String getValue() {
             return value;
         }
 
-        public void setValue(String value) {
-            this.value = value;
-        }
-
         public String getPrefix() {
             return prefix;
         }
 
-        public void setPrefix(String prefix) {
-            this.prefix = prefix;
+        public List<Predicate> getPredicates() {
+            if (predicates == null) {
+                return Collections.emptyList();
+            }
+            return Collections.unmodifiableList(predicates);
         }
 
+        public void setPredicates(List<Predicate> predicates) {
+            this.predicates = predicates;
+        }
+        
+        @Override
+        public String toString() {
+            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) {
+                    sb.append("[");
+                    predicate.toString();
+                    sb.append("]");
+                }
+            }
+            return sb.toString();
+        }
+
+    }
+    
+    public static final class Predicate {
+        
+        private final IdentityValue name;
+        private final String value;
+        
+        public Predicate(IdentityValue name, 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();
+            if (name != null) {
+                sb.append(name.toString());
+            }
+            if (value != null) {
+                sb.append("=").append(value);
+            }
+            return sb.toString();
+        }
+        
+        public boolean isLeafList() {
+            return name == null ? true : false;
+        }
+        
     }
 }