Integrate netconf-mapping-api into netconf-server

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

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
index 53b7ba4a107e0fdb0cdb41e0b2da10a3fd382872..0de0b16e69a6453552bde2d83b2652fe7a83c918 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
@@ -7,29 +7,27 @@
  */
 package org.opendaylight.netconf.mdsal.connector.ops;
 
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
-import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation;
+import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-// FIXME duplicated code
-// netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/Commit.java
 public class Commit extends AbstractSingletonNetconfOperation {
-
     private static final Logger LOG = LoggerFactory.getLogger(Commit.class);
-
     private static final String OPERATION_NAME = "commit";
+
     private final TransactionProvider transactionProvider;
 
     public Commit(final String netconfSessionIdForReporting, final TransactionProvider transactionProvider) {
         super(netconfSessionIdForReporting);
-        this.transactionProvider = transactionProvider;
-
+        this.transactionProvider = requireNonNull(transactionProvider);
     }
 
     @Override