Bug 499: Fixed normalization of InstanceIdentifier for backwards compatibility

[controller.git] / opendaylight / md-sal / sal-common-impl / src / main / java / org / opendaylight / controller / md / sal / common / impl / util / compat / DataNormalizationOperation.java

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
index de90f48b35d7506351afb26373a60b9a4c773442..941f2fdb39059950a5d3ae910848a282c7c3311a 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
@@ -61,6 +61,11 @@ public abstract class DataNormalizationOperation<T extends PathArgument> impleme
         return false;
     }
 
         return false;
     }
 

+
+    public boolean isKeyedEntry() {
+        return false;
+    }
+

     protected Set<QName> getQNameIdentifiers() {
         return Collections.singleton(identifier.getNodeType());
     }
     protected Set<QName> getQNameIdentifiers() {
         return Collections.singleton(identifier.getNodeType());
     }


@@ -129,6 +134,11 @@ public abstract class DataNormalizationOperation<T extends PathArgument> impleme
             return Builders.leafSetEntryBuilder().withNodeIdentifier(nodeId).withValue(node.getValue()).build();
         }
 
             return Builders.leafSetEntryBuilder().withNodeIdentifier(nodeId).withValue(node.getValue()).build();
         }
 

+
+        @Override
+        public boolean isKeyedEntry() {
+            return true;
+        }

     }
 
     private static abstract class CompositeNodeNormalizationOpertation<T extends PathArgument> extends
     }
 
     private static abstract class CompositeNodeNormalizationOpertation<T extends PathArgument> extends


@@ -243,7 +253,9 @@ public abstract class DataNormalizationOperation<T extends PathArgument> impleme
         protected NormalizedNodeContainerBuilder createBuilder(final CompositeNode compositeNode) {
             ImmutableMap.Builder<QName, Object> keys = ImmutableMap.builder();
             for (QName key : keyDefinition) {
         protected NormalizedNodeContainerBuilder createBuilder(final CompositeNode compositeNode) {
             ImmutableMap.Builder<QName, Object> keys = ImmutableMap.builder();
             for (QName key : keyDefinition) {

-                SimpleNode<?> valueNode = checkNotNull(compositeNode.getFirstSimpleByName(key),"List node %s MUST contain leaf %s with value.",getIdentifier().getNodeType(),key);
+
+                SimpleNode<?> valueNode = checkNotNull(compositeNode.getFirstSimpleByName(key),
+                        "List node %s MUST contain leaf %s with value.", getIdentifier().getNodeType(), key);

                 keys.put(key, valueNode.getValue());
             }
 
                 keys.put(key, valueNode.getValue());
             }
 


@@ -263,6 +275,12 @@ public abstract class DataNormalizationOperation<T extends PathArgument> impleme
             }
             return builder.build();
         }
             }
             return builder.build();
         }

+
+
+        @Override
+        public boolean isKeyedEntry() {
+            return true;
+        }

     }
 
     private static final class ContainerNormalization extends DataContainerNormalizationOperation<NodeIdentifier> {
     }
 
     private static final class ContainerNormalization extends DataContainerNormalizationOperation<NodeIdentifier> {