Integrate netconf-mapping-api into netconf-server

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

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java
index 66199d984c15ce49dedcdcdce06730e82fb49ad9..24c4c68519e53d0c7aa77f5859a5e1786f03d23e 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java
@@ -5,35 +5,31 @@
  * 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.rpchandler;
 
-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 SettableOperationRpcProvider implements NetconfOperationServiceFactory {
-
     private final RpcHandler rpcHandler;
 
-    public SettableOperationRpcProvider(RpcHandler rpcHandler) {
+    public SettableOperationRpcProvider(final RpcHandler rpcHandler) {
         this.rpcHandler = rpcHandler;
     }
 
     @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
@@ -42,16 +38,15 @@ public class SettableOperationRpcProvider implements NetconfOperationServiceFact
     }
 
     private static class SettableOperationService implements NetconfOperationService {
-
         private final SettableRpc rpc;
 
-        private SettableOperationService(RpcHandler rpcHandler) {
-            this.rpc = new SettableRpc(rpcHandler);
+        SettableOperationService(final RpcHandler rpcHandler) {
+            rpc = new SettableRpc(rpcHandler);
         }
 
         @Override
         public Set<NetconfOperation> getNetconfOperations() {
-            return Collections.singleton(rpc);
+            return Set.of(rpc);
         }
 
         @Override