Integrate netconf-mapping-api into netconf-server

[netconf.git] / protocol / netconf-server / src / main / java / org / opendaylight / netconf / server / NetconfServerSessionNegotiatorFactory.java

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java
index f3908b2ae3c77392ad831dd28e16e65f9725b4bd..ee168d9ca1b1e92130bb5c34ab67deb2a7869271 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java
@@ -18,14 +18,14 @@ import java.net.SocketAddress;
 import java.util.Set;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.opendaylight.netconf.api.NetconfSessionListenerFactory;
-import org.opendaylight.netconf.api.messages.NetconfHelloMessage;
+import org.opendaylight.netconf.api.messages.HelloMessage;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mapping.api.NetconfOperationService;
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.nettyutil.AbstractNetconfSessionNegotiator;
 import org.opendaylight.netconf.nettyutil.NetconfSessionNegotiatorFactory;
-import org.opendaylight.netconf.server.osgi.NetconfOperationRouter;
+import org.opendaylight.netconf.server.api.SessionIdProvider;
+import org.opendaylight.netconf.server.api.operations.NetconfOperationService;
+import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities;
@@ -116,11 +116,10 @@ public class NetconfServerSessionNegotiatorFactory
 
     private NetconfServerSessionListener getListener(final String netconfSessionIdForReporting,
                                                      final SocketAddress socketAddress) {
-        final NetconfOperationService service = getOperationServiceForAddress(netconfSessionIdForReporting,
-                socketAddress);
-        final NetconfOperationRouter operationRouter =
-                new NetconfOperationRouterImpl(service, monitoringService, netconfSessionIdForReporting);
-        return new NetconfServerSessionListener(operationRouter, monitoringService, service);
+        final var service = getOperationServiceForAddress(netconfSessionIdForReporting, socketAddress);
+        return new NetconfServerSessionListener(
+            new NetconfOperationRouterImpl(service, monitoringService, netconfSessionIdForReporting), monitoringService,
+            service);
     }
 
     protected NetconfOperationService getOperationServiceForAddress(final String netconfSessionIdForReporting,
@@ -132,10 +131,10 @@ public class NetconfServerSessionNegotiatorFactory
         return aggregatedOpService;
     }
 
-    private NetconfHelloMessage createHelloMessage(
-            final long sessionId, final NetconfMonitoringService capabilityProvider) {
-        return NetconfHelloMessage.createServerHello(Sets.union(transformCapabilities(capabilityProvider
-                .getCapabilities()), baseCapabilities), sessionId);
+    private HelloMessage createHelloMessage(final long sessionId, final NetconfMonitoringService capabilityProvider) {
+        return HelloMessage.createServerHello(Sets.union(
+            transformCapabilities(capabilityProvider.getCapabilities()), baseCapabilities),
+            sessionId);
     }
 
     public static Set<String> transformCapabilities(final Capabilities capabilities) {