Remove dependency on controller config-util

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

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
index 68bebb2756c3be064e6ce3c4b92068e6f9f7c91c..b49f39998b8222b269e4a1a6bad7a49aeaa7eb20 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
@@ -13,7 +13,7 @@ import com.google.common.collect.Sets;
 import java.io.File;
 import java.util.Collections;
 import java.util.Set;
-import org.opendaylight.controller.config.util.capability.Capability;
+import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
 import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
@@ -22,6 +22,7 @@ import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.test.tool.rpc.DataList;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedCommit;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedCreateSubscription;
+import org.opendaylight.netconf.test.tool.rpc.SimulatedDiscardChanges;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedEditConfig;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedGet;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedGetConfig;
@@ -32,12 +33,13 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
     private final Set<Capability> caps;
     private final SimulatedOperationService simulatedOperationService;
 
-    public SimulatedOperationProvider(final SessionIdProvider idProvider,
-                                      final Set<Capability> caps,
-                                      final Optional<File> notificationsFile,
-                                      final Optional<File> initialConfigXMLFile) {
+    SimulatedOperationProvider(final SessionIdProvider idProvider,
+                               final Set<Capability> caps,
+                               final Optional<File> notificationsFile,
+                               final Optional<File> initialConfigXMLFile) {
         this.caps = caps;
-        simulatedOperationService = new SimulatedOperationService(idProvider.getCurrentSessionId(), notificationsFile, initialConfigXMLFile);
+        simulatedOperationService = new SimulatedOperationService(
+            idProvider.getCurrentSessionId(), notificationsFile, initialConfigXMLFile);
     }
 
     @Override
@@ -49,10 +51,7 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
     public AutoCloseable registerCapabilityListener(
             final CapabilityListener listener) {
         listener.onCapabilitiesChanged(caps, Collections.<Capability>emptySet());
-        return new AutoCloseable() {
-            @Override
-            public void close() throws Exception {
-            }
+        return () -> {
         };
     }
 
@@ -67,7 +66,8 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
         private final Optional<File> notificationsFile;
         private final Optional<File> initialConfigXMLFile;
 
-        public SimulatedOperationService(final long currentSessionId, final Optional<File> notificationsFile, final Optional<File> initialConfigXMLFile) {
+        SimulatedOperationService(final long currentSessionId, final Optional<File> notificationsFile,
+                                  final Optional<File> initialConfigXMLFile) {
             this.currentSessionId = currentSessionId;
             this.notificationsFile = notificationsFile;
             this.initialConfigXMLFile = initialConfigXMLFile;
@@ -78,13 +78,17 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
             final DataList storage = new DataList();
             final SimulatedGet sGet = new SimulatedGet(String.valueOf(currentSessionId), storage);
             final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
-            final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(String.valueOf(currentSessionId), storage, initialConfigXMLFile );
+            final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(
+                String.valueOf(currentSessionId), storage, initialConfigXMLFile);
             final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(currentSessionId));
             final SimulatedLock sLock = new SimulatedLock(String.valueOf(currentSessionId));
             final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(currentSessionId));
             final SimulatedCreateSubscription sCreateSubs = new SimulatedCreateSubscription(
                     String.valueOf(currentSessionId), notificationsFile);
-            return Sets.<NetconfOperation>newHashSet(sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs);
+            final SimulatedDiscardChanges sDiscardChanges = new SimulatedDiscardChanges(
+                String.valueOf(currentSessionId));
+            return Sets.newHashSet(
+                sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs, sDiscardChanges);
         }
 
         @Override