Integrate netconf-mapping-api into netconf-server

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

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java
index d811fe70f435be487e88917e4a859fc22e54388c..bcf30eeb6479df404640d9d39044951a50b05f47 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java
@@ -5,20 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.test.tool.customrpc;
 
 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.mapping.api.NetconfOperation;
-import org.opendaylight.netconf.mapping.api.NetconfOperationService;
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.api.operations.NetconfOperation;
+import org.opendaylight.netconf.server.api.operations.NetconfOperationService;
+import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory;
+import org.opendaylight.yangtools.concepts.Registration;
 
 public class SettableOperationProvider implements NetconfOperationServiceFactory {
-
     private final File rpcConfig;
 
     public SettableOperationProvider(final File rpcConfig) {
@@ -27,14 +25,12 @@ public class SettableOperationProvider implements NetconfOperationServiceFactory
 
     @Override
     public Set<Capability> getCapabilities() {
-        return Collections.emptySet();
+        return Set.of();
     }
 
     @Override
-    public AutoCloseable registerCapabilityListener(final CapabilityListener listener) {
-        return () -> {
-            //no op
-        };
+    public Registration registerCapabilityListener(final CapabilityListener listener) {
+        return () -> { };
     }
 
     @Override
@@ -43,16 +39,15 @@ public class SettableOperationProvider implements NetconfOperationServiceFactory
     }
 
     private static class SettableOperationService implements NetconfOperationService {
-
         private final SettableRpc rpc;
 
-        private SettableOperationService(final File rpcConfig) {
-            this.rpc = new SettableRpc(rpcConfig);
+        SettableOperationService(final File rpcConfig) {
+            rpc = new SettableRpc(rpcConfig);
         }
 
         @Override
         public Set<NetconfOperation> getNetconfOperations() {
-            return Collections.singleton(rpc);
+            return Set.of(rpc);
         }
 
         @Override