Integrate netconf-mapping-api into netconf-server

[netconf.git] / netconf / mdsal-netconf-connector / src / main / java / org / opendaylight / netconf / mdsal / connector / ops / get / Get.java

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java
index 8dc6fdd3c9a21185ad56ad8c6d75831a4c5f0af1..811c3038f5a2465637c7cbe29f4bebdc7753158b 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java
@@ -16,10 +16,6 @@ import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
 import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
-import org.opendaylight.netconf.mdsal.connector.ops.Datastore;
-import org.opendaylight.yangtools.yang.common.ErrorSeverity;
-import org.opendaylight.yangtools.yang.common.ErrorTag;
-import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
@@ -28,14 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public class Get extends AbstractGet {
-
     private static final Logger LOG = LoggerFactory.getLogger(Get.class);
-
     private static final String OPERATION_NAME = "get";
+
     private final TransactionProvider transactionProvider;
 
     public Get(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext,
-               final TransactionProvider transactionProvider) {
+            final TransactionProvider transactionProvider) {
         super(netconfSessionIdForReporting, schemaContext);
         this.transactionProvider = transactionProvider;
     }
@@ -51,7 +46,7 @@ public class Get extends AbstractGet {
 
         final YangInstanceIdentifier dataRoot = dataRootOptional.orElseThrow();
 
-        final DOMDataTreeReadWriteTransaction rwTx = getTransaction(Datastore.running);
+        final DOMDataTreeReadWriteTransaction rwTx = transactionProvider.createRunningTransaction();
         try {
             final Optional<NormalizedNode> normalizedNodeOptional = rwTx.read(
                     LogicalDatastoreType.OPERATIONAL, dataRoot).get();
@@ -68,16 +63,6 @@ public class Get extends AbstractGet {
         }
     }
 
-    private DOMDataTreeReadWriteTransaction getTransaction(final Datastore datastore) throws DocumentedException {
-        if (datastore == Datastore.candidate) {
-            return transactionProvider.getOrCreateTransaction();
-        } else if (datastore == Datastore.running) {
-            return transactionProvider.createRunningTransaction();
-        }
-        throw new DocumentedException("Incorrect Datastore: ", ErrorType.PROTOCOL, ErrorTag.BAD_ELEMENT,
-                ErrorSeverity.ERROR);
-    }
-
     @Override
     protected String getOperationName() {
         return OPERATION_NAME;