Serialization/Deserialization and a host of other fixes

[controller.git] / opendaylight / md-sal / sal-protocolbuffer-encoding / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / NodeIdentifierWithValueGenerator.java

diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java
index fcde679bedab36d90715af74a269cad259bdf33a..b2ec5644d4b9d8c29803a69eeafc3a758d4c56ab 100644 (file)
--- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java
+++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java
@@ -1,18 +1,23 @@
 package org.opendaylight.controller.cluster.datastore.node.utils;
 
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class NodeIdentifierWithValueGenerator{
         private final String id;
-        private static final Pattern pattern = Pattern.compile("(.*)\\Q[\\E(.*)\\Q]\\E");
+    private final DataSchemaNode schemaNode;
+    private static final Pattern pattern = Pattern.compile("(.*)\\Q[\\E(.*)\\Q]\\E");
         private final Matcher matcher;
         private final boolean doesMatch;
 
-        public NodeIdentifierWithValueGenerator(String id){
+        public NodeIdentifierWithValueGenerator(String id, DataSchemaNode schemaNode){
             this.id = id;
+            this.schemaNode = schemaNode;
             matcher = pattern.matcher(this.id);
             doesMatch = matcher.matches();
         }
@@ -26,6 +31,18 @@ public class NodeIdentifierWithValueGenerator{
             final String value = matcher.group(2);
 
             return new YangInstanceIdentifier.NodeWithValue(
-                QNameFactory.create(name), value);
+                QNameFactory.create(name), getValue(value));
         }
+
+        private Object getValue(String value){
+            if(schemaNode != null){
+                if(schemaNode instanceof LeafListSchemaNode){
+                    return TypeDefinitionAwareCodec
+                        .from(LeafListSchemaNode.class.cast(schemaNode).getType()).deserialize(value);
+
+                }
+            }
+        return value;
+        }
+
     }