RestconfTransaction always operates on a single datastore

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / rests / transactions / NetconfRestconfTransaction.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java
index f28f406199eec1a535fef04931270dfa48d89306..f5c48882d7072ce5856a4223491e09ca19f68d08 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java
@@ -8,6 +8,7 @@
 package org.opendaylight.restconf.nb.rfc8040.rests.transactions;
 
 import static java.util.Objects.requireNonNull;
+import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FluentFuture;
@@ -27,7 +28,6 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.CommitInfo;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
@@ -69,51 +69,49 @@ final class NetconfRestconfTransaction extends RestconfTransaction {
     }
 
     @Override
-    public void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
-        enqueueOperation(() -> netconfService.delete(store, path));
+    public void delete(final YangInstanceIdentifier path) {
+        enqueueOperation(() -> netconfService.delete(CONFIGURATION, path));
     }
 
     @Override
-    public void remove(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
-        enqueueOperation(() -> netconfService.remove(store, path));
+    public void remove(final YangInstanceIdentifier path) {
+        enqueueOperation(() -> netconfService.remove(CONFIGURATION, path));
     }
 
     @Override
-    public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) {
-        enqueueOperation(() -> netconfService.merge(store, path, data, Optional.empty()));
+    public void merge(final YangInstanceIdentifier path, final NormalizedNode data) {
+        enqueueOperation(() -> netconfService.merge(CONFIGURATION, path, data, Optional.empty()));
     }
 
     @Override
-    public void create(final LogicalDatastoreType store, final YangInstanceIdentifier path,
-           final NormalizedNode data, final SchemaContext schemaContext) {
+    public void create(final YangInstanceIdentifier path, final NormalizedNode data,
+            final SchemaContext schemaContext) {
         if (data instanceof MapNode || data instanceof LeafSetNode) {
             final NormalizedNode emptySubTree = ImmutableNodes.fromInstanceId(schemaContext, path);
-            merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.create(emptySubTree.getIdentifier()),
-                emptySubTree);
+            merge(YangInstanceIdentifier.create(emptySubTree.getIdentifier()), emptySubTree);
 
             for (final NormalizedNode child : ((NormalizedNodeContainer<?>) data).body()) {
                 final YangInstanceIdentifier childPath = path.node(child.getIdentifier());
-                enqueueOperation(() -> netconfService.create(store, childPath, child, Optional.empty()));
+                enqueueOperation(() -> netconfService.create(CONFIGURATION, childPath, child, Optional.empty()));
             }
         } else {
-            enqueueOperation(() -> netconfService.create(store, path, data, Optional.empty()));
+            enqueueOperation(() -> netconfService.create(CONFIGURATION, path, data, Optional.empty()));
         }
     }
 
     @Override
-    public void replace(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data,
+    public void replace(final YangInstanceIdentifier path, final NormalizedNode data,
             final SchemaContext schemaContext) {
         if (data instanceof MapNode || data instanceof LeafSetNode) {
             final NormalizedNode emptySubTree = ImmutableNodes.fromInstanceId(schemaContext, path);
-            merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.create(emptySubTree.getIdentifier()),
-                emptySubTree);
+            merge(YangInstanceIdentifier.create(emptySubTree.getIdentifier()), emptySubTree);
 
             for (final NormalizedNode child : ((NormalizedNodeContainer<?>) data).body()) {
                 final YangInstanceIdentifier childPath = path.node(child.getIdentifier());
-                enqueueOperation(() -> netconfService.replace(store, childPath, child, Optional.empty()));
+                enqueueOperation(() -> netconfService.replace(CONFIGURATION, childPath, child, Optional.empty()));
             }
         } else {
-            enqueueOperation(() -> netconfService.replace(store, path, data, Optional.empty()));
+            enqueueOperation(() -> netconfService.replace(CONFIGURATION, path, data, Optional.empty()));
         }
     }