Move NetconfMessage into netconf.api.messages

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / rpc / SimulatedCreateSubscription.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
index b354dcd1008c5955595cce4702f967e529247d69..764cd061bcdb3042143f4252dfc7f940f05fcf0e 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
@@ -23,13 +23,14 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.messages.NetconfMessage;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.server.NetconfServerSession;
+import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation;
 import org.opendaylight.netconf.server.mapping.operations.DefaultNetconfOperation;
-import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -40,11 +41,10 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im
     private NetconfServerSession session;
     private ScheduledExecutorService scheduledExecutorService;
 
-    public SimulatedCreateSubscription(final String id, final Optional<File> notificationsFile) {
-        super(id);
+    public SimulatedCreateSubscription(final SessionIdType sessionId, final Optional<File> notificationsFile) {
+        super(sessionId);
 
         final Optional<Notifications> notifs;
-
         if (notificationsFile.isPresent()) {
             notifs = Optional.of(loadNotifications(notificationsFile.orElseThrow()));
             scheduledExecutorService = Executors.newScheduledThreadPool(1);