BUG-509: StoreUtils should operate on NormalizedNode

This prunes the use of MetadataNode from StoreUtils. It turns out it is
completely unnecessary. This removes the last user of
Metadata.getChildren(), which will be removed in a subsequent patch.

Change-Id: I778e77b826576b8fa53e040a825d615dab7d253f
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java
index 005e3b772dc1259356e11d6722cd1744963f23d1..e848a51a66ee84eb05f743acab9fbd82a21ab008 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java
@@ -152,7 +152,7 @@ public class InMemoryDOMDataStore implements DOMStore, Identifiable<String>, Sch
                 .getSubtreeVersion(), newDataTree.getSubtreeVersion());
 
         if (LOG.isTraceEnabled()) {
                 .getSubtreeVersion(), newDataTree.getSubtreeVersion());
 
         if (LOG.isTraceEnabled()) {

-            LOG.trace("Data Tree is {}", StoreUtils.toStringTree(newDataTree));
+            LOG.trace("Data Tree is {}", StoreUtils.toStringTree(newDataTree.getData()));

         }
 
         final DataAndMetadataSnapshot newSnapshot = DataAndMetadataSnapshot.builder() //
         }
 
         final DataAndMetadataSnapshot newSnapshot = DataAndMetadataSnapshot.builder() //

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/StoreUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/StoreUtils.java
index 0f77ac504a3f5a647f9a184e88b7ecc569332c6f..c2ca1b4c54f9945a7e44a1761c531c3a6c6a4f3d 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/StoreUtils.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/StoreUtils.java
@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.primitives.UnsignedLong;
 
 public final class StoreUtils {
 import com.google.common.primitives.UnsignedLong;
 
 public final class StoreUtils {

+    private static final int STRINGTREE_INDENT = 4;

 
     private final static Function<Identifiable<Object>, Object> EXTRACT_IDENTIFIER = new Function<Identifiable<Object>, Object>() {
         @Override
 
     private final static Function<Identifiable<Object>, Object> EXTRACT_IDENTIFIER = new Function<Identifiable<Object>, Object>() {
         @Override


@@ -37,6 +38,10 @@ public final class StoreUtils {
         }
     };
 
         }
     };
 

+    private StoreUtils() {
+        throw new UnsupportedOperationException("Utility class should not be instantiated");
+    }
+

     public static final UnsignedLong increase(final UnsignedLong original) {
         return original.plus(UnsignedLong.ONE);
     }
     public static final UnsignedLong increase(final UnsignedLong original) {
         return original.plus(UnsignedLong.ONE);
     }


@@ -107,24 +112,27 @@ public final class StoreUtils {
         return FluentIterable.from(children).transform(StoreUtils.<V> identifierExtractor()).toSet();
     }
 
         return FluentIterable.from(children).transform(StoreUtils.<V> identifierExtractor()).toSet();
     }
 

-    public static String toStringTree(final StoreMetadataNode metaNode) {
+    public static String toStringTree(final NormalizedNode<?, ?> node) {

         StringBuilder builder = new StringBuilder();
         StringBuilder builder = new StringBuilder();

-        toStringTree(builder, metaNode, 0);
+        toStringTree(builder, node, 0);

         return builder.toString();
     }
 
         return builder.toString();
     }
 

-    private static void toStringTree(final StringBuilder builder, final StoreMetadataNode metaNode, final int offset) {
-        String prefix = Strings.repeat(" ", offset);
-        builder.append(prefix).append(toStringTree(metaNode.getIdentifier()));
-        NormalizedNode<?, ?> dataNode = metaNode.getData();
-        if (dataNode instanceof NormalizedNodeContainer<?, ?, ?>) {
+    private static void toStringTree(final StringBuilder builder, final NormalizedNode<?, ?> node, final int offset) {
+        final String prefix = Strings.repeat(" ", offset);
+
+        builder.append(prefix).append(toStringTree(node.getIdentifier()));
+        if (node instanceof NormalizedNodeContainer<?, ?, ?>) {
+            final NormalizedNodeContainer<?, ?, ?> container = (NormalizedNodeContainer<?, ?, ?>) node;
+

             builder.append(" {\n");
             builder.append(" {\n");

-            for (StoreMetadataNode child : metaNode.getChildren()) {
-                toStringTree(builder, child, offset + 4);
+            for (NormalizedNode<?, ?> child : container.getValue()) {
+                toStringTree(builder, child, offset + STRINGTREE_INDENT);

             }
             }

+

             builder.append(prefix).append('}');
         } else {
             builder.append(prefix).append('}');
         } else {

-            builder.append(' ').append(dataNode.getValue());
+            builder.append(' ').append(node.getValue());

         }
         builder.append('\n');
     }
         }
         builder.append('\n');
     }