X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fmdsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fmdsal%2Fconnector%2Fops%2FEditOperationStrategyProvider.java;h=505e38739b458991c5516d72b4ca015420476dff;hb=61613842c6f3ab0aa74360eb6539d930e1c110eb;hp=541c0b288eac9a288aae3054234dac60a81eea98;hpb=ddfdd7b56162e9c45639388b10407d45f5f0ba13;p=netconf.git

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditOperationStrategyProvider.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditOperationStrategyProvider.java
index 541c0b288e..505e38739b 100644
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditOperationStrategyProvider.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditOperationStrategyProvider.java
@@ -16,7 +16,11 @@ import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.EditConfigInput;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
-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;
 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;
@@ -36,114 +40,122 @@ import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.Dom
 
 class EditOperationStrategyProvider extends DomToNormalizedNodeParserFactory.BuildingStrategyProvider {
 
-    private static final QName OPERATION_ATTRIBUTE = QName.create(EditConfigInput.QNAME.getNamespace(), null, XmlNetconfConstants.OPERATION_ATTR_KEY);
+    private static final QName OPERATION_ATTRIBUTE = QName.create(EditConfigInput.QNAME.getNamespace(), null,
+            XmlNetconfConstants.OPERATION_ATTR_KEY);
 
     private final DataTreeChangeTracker changeTracker;
 
-    public EditOperationStrategyProvider(final DataTreeChangeTracker changeTracker) {
+    EditOperationStrategyProvider(final DataTreeChangeTracker changeTracker) {
         this.changeTracker = changeTracker;
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, LeafNode<?>> forLeaf() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, LeafNode<?>> forLeaf() {
         return new NetconfOperationLeafStrategy(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, ContainerNode> forContainer() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, ContainerNode> forContainer() {
         return new NetconfOperationContainerStrategy<>(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, MapNode> forMap() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, MapNode> forMap() {
         return new NetconfOperationCollectionStrategy<>(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<?>> forLeafSetEntry() {
+    protected ExtensibleParser.BuildingStrategy<NodeWithValue, LeafSetEntryNode<?>> forLeafSetEntry() {
         return new NetconfOperationLeafSetEntryStrategy(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> forMapEntry() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifierWithPredicates, MapEntryNode> forMapEntry() {
         return new NetconfOperationContainerStrategy<>(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, OrderedMapNode> forOrderedList() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, OrderedMapNode> forOrderedList() {
         return new NetconfOperationCollectionStrategy<>(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, UnkeyedListEntryNode> forUnkeyedListEntry() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, UnkeyedListEntryNode> forUnkeyedListEntry() {
         return new NetconfOperationContainerStrategy<>(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, UnkeyedListNode> forUnkeyedList() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, UnkeyedListNode> forUnkeyedList() {
         return new NetconfOperationCollectionStrategy<>(changeTracker);
     }
 
     @Override
-    protected ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, ChoiceNode> forChoice() {
+    protected ExtensibleParser.BuildingStrategy<NodeIdentifier, ChoiceNode> forChoice() {
         return new NetconfOperationContainerStrategy<>(changeTracker);
     }
 
     @Override
-    public ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.AugmentationIdentifier, AugmentationNode> forAugmentation() {
+    public ExtensibleParser.BuildingStrategy<AugmentationIdentifier, AugmentationNode> forAugmentation() {
         return new NetconfOperationContainerStrategy<>(changeTracker);
     }
 
-    private static class NetconfOperationCollectionStrategy<N extends NormalizedNode<YangInstanceIdentifier.NodeIdentifier, ?>> implements ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, N> {
+    private static class NetconfOperationCollectionStrategy<N extends NormalizedNode<NodeIdentifier, ?>>
+            implements ExtensibleParser.BuildingStrategy<NodeIdentifier, N> {
         private final DataTreeChangeTracker changeTracker;
 
-        public NetconfOperationCollectionStrategy(final DataTreeChangeTracker changeTracker) {
+        NetconfOperationCollectionStrategy(final DataTreeChangeTracker changeTracker) {
             this.changeTracker = changeTracker;
         }
 
         @Nullable
         @Override
-        public N build(final NormalizedNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ?, N> builder) {
+        public N build(final NormalizedNodeBuilder<NodeIdentifier, ?, N> builder) {
             changeTracker.popPath();
             return builder.build();
         }
 
         @Override
-        public void prepareAttributes(final Map<QName, String> attributes, final NormalizedNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ?, N> containerBuilder) {
+        public void prepareAttributes(
+                final Map<QName, String> attributes,
+                final NormalizedNodeBuilder<NodeIdentifier, ?, N> containerBuilder) {
             changeTracker.pushPath(containerBuilder.build().getIdentifier());
         }
     }
 
-    public static final class NetconfOperationLeafStrategy implements ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeIdentifier, LeafNode<?>> {
+    public static final class NetconfOperationLeafStrategy
+            implements ExtensibleParser.BuildingStrategy<NodeIdentifier, LeafNode<?>> {
 
         private final DataTreeChangeTracker dataTreeChangeTracker;
 
-        public NetconfOperationLeafStrategy(final DataTreeChangeTracker dataTreeChangeTracker) {
+        NetconfOperationLeafStrategy(final DataTreeChangeTracker dataTreeChangeTracker) {
             this.dataTreeChangeTracker = dataTreeChangeTracker;
         }
 
         @Nullable
         @Override
-        public LeafNode<?> build(final NormalizedNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ?, LeafNode<?>> builder) {
+        public LeafNode<?> build(
+                final NormalizedNodeBuilder<NodeIdentifier, ?, LeafNode<?>> builder) {
             LeafNode<?> node = builder.build();
             String operation = (String) node.getAttributeValue(OPERATION_ATTRIBUTE);
             if (operation == null) {
                 return node;
             }
 
-            if(builder instanceof AttributesBuilder<?>) {
+            if (builder instanceof AttributesBuilder<?>) {
                 ((AttributesBuilder<?>) builder).withAttributes(Collections.<QName, String>emptyMap());
             }
 
             node = builder.build();
 
             ModifyAction action = ModifyAction.fromXmlValue(operation);
-            if (dataTreeChangeTracker.getDeleteOperationTracker() > 0 || dataTreeChangeTracker.getRemoveOperationTracker() > 0) {
+            if (dataTreeChangeTracker.getDeleteOperationTracker() > 0
+                    || dataTreeChangeTracker .getRemoveOperationTracker() > 0) {
                 return node;
             } else {
                 if (!action.equals(dataTreeChangeTracker.peekAction())) {
                     dataTreeChangeTracker.pushPath(node.getIdentifier());
-                    dataTreeChangeTracker.addDataTreeChange(new DataTreeChangeTracker.DataTreeChange(node, action, new ArrayList<>(dataTreeChangeTracker.getCurrentPath())));
+                    dataTreeChangeTracker.addDataTreeChange(new DataTreeChangeTracker.DataTreeChange(node, action,
+                            new ArrayList<>(dataTreeChangeTracker.getCurrentPath())));
                     dataTreeChangeTracker.popPath();
                     return null;
                 } else {
@@ -153,22 +165,25 @@ class EditOperationStrategyProvider extends DomToNormalizedNodeParserFactory.Bui
         }
 
         @Override
-        public void prepareAttributes(final Map<QName, String> attributes, final NormalizedNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ?, LeafNode<?>> containerBuilder) {
+        public void prepareAttributes(
+                final Map<QName, String> attributes,
+                final NormalizedNodeBuilder<NodeIdentifier, ?, LeafNode<?>> containerBuilder) {
             // Noop
         }
     }
 
-    public static final class NetconfOperationLeafSetEntryStrategy implements ExtensibleParser.BuildingStrategy<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<?>> {
+    public static final class NetconfOperationLeafSetEntryStrategy
+            implements ExtensibleParser.BuildingStrategy<NodeWithValue, LeafSetEntryNode<?>> {
 
         private final DataTreeChangeTracker dataTreeChangeTracker;
 
-        public NetconfOperationLeafSetEntryStrategy(final DataTreeChangeTracker dataTreeChangeTracker) {
+        NetconfOperationLeafSetEntryStrategy(final DataTreeChangeTracker dataTreeChangeTracker) {
             this.dataTreeChangeTracker = dataTreeChangeTracker;
         }
 
         @Nullable
         @Override
-        public LeafSetEntryNode<?> build(final NormalizedNodeBuilder<YangInstanceIdentifier.NodeWithValue, ?, LeafSetEntryNode<?>> builder) {
+        public LeafSetEntryNode<?> build(final NormalizedNodeBuilder<NodeWithValue, ?, LeafSetEntryNode<?>> builder) {
             LeafSetEntryNode<?> node = builder.build();
             String operation = (String) node.getAttributeValue(OPERATION_ATTRIBUTE);
             if (operation == null) {
@@ -182,12 +197,14 @@ class EditOperationStrategyProvider extends DomToNormalizedNodeParserFactory.Bui
             node = builder.build();
 
             ModifyAction action = ModifyAction.fromXmlValue(operation);
-            if (dataTreeChangeTracker.getDeleteOperationTracker() > 0 || dataTreeChangeTracker.getRemoveOperationTracker() > 0) {
+            if (dataTreeChangeTracker.getDeleteOperationTracker() > 0
+                    || dataTreeChangeTracker.getRemoveOperationTracker() > 0) {
                 return node;
             } else {
                 if (!action.equals(dataTreeChangeTracker.peekAction())) {
                     dataTreeChangeTracker.pushPath(node.getIdentifier());
-                    dataTreeChangeTracker.addDataTreeChange(new DataTreeChangeTracker.DataTreeChange(node, action, new ArrayList<>(dataTreeChangeTracker.getCurrentPath())));
+                    dataTreeChangeTracker.addDataTreeChange(new DataTreeChangeTracker.DataTreeChange(node, action,
+                            new ArrayList<>(dataTreeChangeTracker.getCurrentPath())));
                     dataTreeChangeTracker.popPath();
                     return null;
                 } else {
@@ -197,16 +214,18 @@ class EditOperationStrategyProvider extends DomToNormalizedNodeParserFactory.Bui
         }
 
         @Override
-        public void prepareAttributes(final Map<QName, String> attributes, final NormalizedNodeBuilder<YangInstanceIdentifier.NodeWithValue, ?, LeafSetEntryNode<?>> containerBuilder) {
-
+        public void prepareAttributes(
+                final Map<QName, String> attributes,
+                final NormalizedNodeBuilder<NodeWithValue, ?, LeafSetEntryNode<?>> containerBuilder) {
         }
     }
 
-    public static final class NetconfOperationContainerStrategy<P extends YangInstanceIdentifier.PathArgument, N extends DataContainerNode<P>> implements ExtensibleParser.BuildingStrategy<P, N> {
+    public static final class NetconfOperationContainerStrategy<P extends PathArgument, N
+            extends DataContainerNode<P>> implements ExtensibleParser.BuildingStrategy<P, N> {
 
         private final DataTreeChangeTracker dataTreeChangeTracker;
 
-        public NetconfOperationContainerStrategy(final DataTreeChangeTracker dataTreeChangeTracker) {
+        NetconfOperationContainerStrategy(final DataTreeChangeTracker dataTreeChangeTracker) {
             this.dataTreeChangeTracker = dataTreeChangeTracker;
         }
 
@@ -221,14 +240,16 @@ class EditOperationStrategyProvider extends DomToNormalizedNodeParserFactory.Bui
             final ModifyAction currentAction = dataTreeChangeTracker.popAction();
 
             //if we know that we are going to delete a parent node just complete the entire subtree
-            if (dataTreeChangeTracker.getDeleteOperationTracker() > 0 || dataTreeChangeTracker.getRemoveOperationTracker() > 0) {
+            if (dataTreeChangeTracker.getDeleteOperationTracker() > 0
+                    || dataTreeChangeTracker.getRemoveOperationTracker() > 0) {
                 dataTreeChangeTracker.popPath();
                 return node;
             } else {
                 //if parent and current actions dont match create a DataTreeChange and add it to the change list
                 //dont add a new child to the parent node
                 if (!currentAction.equals(dataTreeChangeTracker.peekAction())) {
-                    dataTreeChangeTracker.addDataTreeChange(new DataTreeChangeTracker.DataTreeChange(node, currentAction, new ArrayList<>(dataTreeChangeTracker.getCurrentPath())));
+                    dataTreeChangeTracker.addDataTreeChange(new DataTreeChangeTracker.DataTreeChange(node,
+                            currentAction, new ArrayList<>(dataTreeChangeTracker.getCurrentPath())));
                     dataTreeChangeTracker.popPath();
                     return null;
                 } else {
@@ -239,7 +260,8 @@ class EditOperationStrategyProvider extends DomToNormalizedNodeParserFactory.Bui
         }
 
         @Override
-        public void prepareAttributes(final Map<QName, String> attributes, final NormalizedNodeBuilder<P, ?, N> containerBuilder) {
+        public void prepareAttributes(final Map<QName, String> attributes,
+                                      final NormalizedNodeBuilder<P, ?, N> containerBuilder) {
             dataTreeChangeTracker.pushPath(containerBuilder.build().getIdentifier());
             final String operation = attributes.get(OPERATION_ATTRIBUTE);
             if (operation != null) {