X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-cli%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fcli%2Fwriter%2Fimpl%2FNodeCliSerializerDispatcher.java;h=e6d47cc24f7125f463a31d60a90df5f34c6e0066;hp=08abd47f251f319870eb285d66d1daa5fa48123e;hb=874a18a9ce5dc09bc49922754bf8fb3e981fffb9;hpb=b3d2a00776a1a5e3a139d73ced859aa557c931af

diff --git a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NodeCliSerializerDispatcher.java b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NodeCliSerializerDispatcher.java
index 08abd47f25..e6d47cc24f 100644
--- a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NodeCliSerializerDispatcher.java
+++ b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NodeCliSerializerDispatcher.java
@@ -9,7 +9,7 @@ package org.opendaylight.controller.netconf.cli.writer.impl;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -21,6 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MixinNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.FromNormalizedNodeSerializerFactory;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.base.serializer.NodeSerializerDispatcher;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
@@ -35,7 +36,7 @@ public class NodeCliSerializerDispatcher implements NodeSerializerDispatcher<Str
 
     @Override
     public final Iterable<String> dispatchChildElement(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         if (dataContainerChild instanceof ContainerNode) {
             return onContainerNode(childSchema, dataContainerChild);
         } else if (dataContainerChild instanceof LeafNode<?>) {
@@ -55,35 +56,34 @@ public class NodeCliSerializerDispatcher implements NodeSerializerDispatcher<Str
     }
 
     private Iterable<String> onAugmentationSchema(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         checkSchemaCompatibility(childSchema, AugmentationSchema.class, dataContainerChild);
         return factory.getAugmentationNodeSerializer().serialize((AugmentationSchema) childSchema,
                 (AugmentationNode) dataContainerChild);
     }
 
     private Iterable<String> onChoiceNode(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
-        checkSchemaCompatibility(childSchema, org.opendaylight.yangtools.yang.model.api.ChoiceNode.class,
-                dataContainerChild);
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
+        checkSchemaCompatibility(childSchema, ChoiceSchemaNode.class, dataContainerChild);
         return factory.getChoiceNodeSerializer().serialize(
-                (org.opendaylight.yangtools.yang.model.api.ChoiceNode) childSchema, (ChoiceNode) dataContainerChild);
+                (ChoiceSchemaNode) childSchema, (ChoiceNode) dataContainerChild);
     }
 
     private Iterable<String> onListNode(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         checkSchemaCompatibility(childSchema, ListSchemaNode.class, dataContainerChild);
         return factory.getMapNodeSerializer().serialize((ListSchemaNode) childSchema, (MapNode) dataContainerChild);
     }
 
     private Iterable<String> onLeafListNode(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         checkSchemaCompatibility(childSchema, LeafListSchemaNode.class, dataContainerChild);
         return factory.getLeafSetNodeSerializer().serialize((LeafListSchemaNode) childSchema,
                 (LeafSetNode<?>) dataContainerChild);
     }
 
     private Iterable<String> onLeafNode(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         checkSchemaCompatibility(childSchema, LeafSchemaNode.class, dataContainerChild);
         final Iterable<String> elements = factory.getLeafNodeSerializer().serialize((LeafSchemaNode) childSchema,
                 (LeafNode<?>) dataContainerChild);
@@ -92,7 +92,7 @@ public class NodeCliSerializerDispatcher implements NodeSerializerDispatcher<Str
     }
 
     private static void checkOnlyOneSerializedElement(final Iterable<?> elements,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         final int size = Iterables.size(elements);
         Preconditions.checkArgument(size == 1,
                 "Unexpected count of elements for entry serialized from: %s, should be 1, was: %s", dataContainerChild,
@@ -100,7 +100,7 @@ public class NodeCliSerializerDispatcher implements NodeSerializerDispatcher<Str
     }
 
     private Iterable<String> onContainerNode(final Object childSchema,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         checkSchemaCompatibility(childSchema, ContainerSchemaNode.class, dataContainerChild);
 
         final Iterable<String> elements = factory.getContainerNodeSerializer().serialize(
@@ -110,9 +110,9 @@ public class NodeCliSerializerDispatcher implements NodeSerializerDispatcher<Str
     }
 
     private static void checkSchemaCompatibility(final Object childSchema, final Class<?> containerSchemaNodeClass,
-            final DataContainerChild<? extends InstanceIdentifier.PathArgument, ?> dataContainerChild) {
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> dataContainerChild) {
         Preconditions.checkArgument(containerSchemaNodeClass.isAssignableFrom(childSchema.getClass()),
                 "Incompatible schema: %s with node: %s, expected: %s", childSchema, dataContainerChild,
                 containerSchemaNodeClass);
     }
-}
\ No newline at end of file
+}