Use NormalizedNode streaming serialization in sal-remoterpc-connector

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / PathUtils.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java
index 902851041a5022d39ef2f4be2079f384006057ca..588fc648fd79f511cf617d3ddd504cf78f168906 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java
@@ -1,11 +1,9 @@
 /*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
- *  Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
 package org.opendaylight.controller.cluster.datastore.node.utils;
@@ -17,72 +15,81 @@ import java.util.List;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
 public class PathUtils {
     private static final Splitter SLASH_SPLITTER = Splitter.on('/').omitEmptyStrings();
 
     /**
-     * Given a YangInstanceIdentifier return a serialized version of the same
-     * as a String
+     * Given a serialized string version of a YangInstanceIdentifier convert
+     * to a YangInstanceIdentifier.
      *
-     * @param path
-     * @return
+     * @param path the path
+     * @return a YangInstanceIdentifier
      */
-    public static String toString(YangInstanceIdentifier path){
-        StringBuilder sb = new StringBuilder();
-        Iterator<YangInstanceIdentifier.PathArgument> iterator =
-            path.getPathArguments().iterator();
-
-        while(iterator.hasNext()){
-            sb.append(toString(iterator.next()));
-            if(iterator.hasNext()){
-                sb.append("/");
-            }
+    public static YangInstanceIdentifier toYangInstanceIdentifier(String path) {
+        List<PathArgument> pathArguments = new ArrayList<>();
+        for (String segment : SLASH_SPLITTER.split(path)) {
+            pathArguments.add(NodeIdentifierFactory.getArgument(segment));
         }
-        return sb.toString();
+        return YangInstanceIdentifier.create(pathArguments);
     }
 
     /**
-     * Given a YangInstanceIdentifier.PathArgument return a serialized version
-     * of the same as a String
+     * Given a YangInstanceIdentifier return a serialized version of the same
+     * as a String.
      *
-     * @param pathArgument
-     * @return
+     * @param path the path
+     * @return the path as a String
      */
-    public static String toString(YangInstanceIdentifier.PathArgument pathArgument){
-        if(pathArgument instanceof YangInstanceIdentifier.NodeIdentifier){
-            return toString((YangInstanceIdentifier.NodeIdentifier) pathArgument);
-        } else if(pathArgument instanceof YangInstanceIdentifier.AugmentationIdentifier){
-            return toString((YangInstanceIdentifier.AugmentationIdentifier) pathArgument);
-        } else if(pathArgument instanceof YangInstanceIdentifier.NodeWithValue){
-            return toString((YangInstanceIdentifier.NodeWithValue) pathArgument);
-        } else if(pathArgument instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates){
-            return toString((YangInstanceIdentifier.NodeIdentifierWithPredicates) pathArgument);
+    public static String toString(YangInstanceIdentifier path) {
+        final Iterator<PathArgument> it = path.getPathArguments().iterator();
+        if (!it.hasNext()) {
+            return "";
         }
 
-        return pathArgument.toString();
+        final StringBuilder sb = new StringBuilder();
+        for (;;) {
+            sb.append(toString(it.next()));
+            if (!it.hasNext()) {
+                break;
+            }
+            sb.append('/');
+        }
+
+        return sb.toString();
     }
 
     /**
-     * Given a serialized string version of a YangInstanceIdentifier convert
-     * to a YangInstanceIdentifier
+     * Given a YangInstanceIdentifier.PathArgument return a serialized version
+     * of the same as a String.
      *
-     * @param path
-     * @return
+     * @param pathArgument the path argument
+     * @return the path argument as a String
      */
-    public static YangInstanceIdentifier toYangInstanceIdentifier(String path){
-        List<YangInstanceIdentifier.PathArgument> pathArguments = new ArrayList<>();
-        for (String segment : SLASH_SPLITTER.split(path)) {
-            pathArguments.add(NodeIdentifierFactory.getArgument(segment));
+    public static String toString(PathArgument pathArgument) {
+        if (pathArgument instanceof NodeIdentifier) {
+            return toString((NodeIdentifier) pathArgument);
+        } else if (pathArgument instanceof AugmentationIdentifier) {
+            return toString((AugmentationIdentifier) pathArgument);
+        } else if (pathArgument instanceof NodeWithValue) {
+            return toString((NodeWithValue<?>) pathArgument);
+        } else if (pathArgument instanceof NodeIdentifierWithPredicates) {
+            return toString((NodeIdentifierWithPredicates) pathArgument);
         }
-        return YangInstanceIdentifier.create(pathArguments);
+
+        return pathArgument.toString();
     }
 
-    private static String toString(YangInstanceIdentifier.NodeIdentifier pathArgument){
+    private static String toString(NodeIdentifier pathArgument) {
         return pathArgument.getNodeType().toString();
     }
 
-    private static String toString(YangInstanceIdentifier.AugmentationIdentifier pathArgument){
+    private static String toString(AugmentationIdentifier pathArgument) {
         Set<QName> childNames = pathArgument.getPossibleChildNames();
         final StringBuilder sb = new StringBuilder("AugmentationIdentifier{");
         sb.append("childNames=").append(childNames).append('}');
@@ -90,12 +97,11 @@ public class PathUtils {
 
     }
 
-    private static String toString(YangInstanceIdentifier.NodeWithValue pathArgument){
+    private static String toString(NodeWithValue<?> pathArgument) {
         return pathArgument.getNodeType().toString() + "[" + pathArgument.getValue() + "]";
     }
 
-    private static String toString(YangInstanceIdentifier.NodeIdentifierWithPredicates pathArgument){
+    private static String toString(NodeIdentifierWithPredicates pathArgument) {
         return pathArgument.getNodeType().toString() + '[' + pathArgument.getKeyValues() + ']';
     }
-
 }