Move NetconfServerDispatcher to netconf.server.api

There is no point in polluting netconf-api with server-side constructs,
this move takes the first step in sanitizing the dependency tree.

Unfortunately we cannot move NetconfServerDispatcherImpl, as it is tied
down by mdsal-netconf-impl's configuration compatibility constraints
(i.e. the configuration is tied to NetconfMonitoringServiceImpl).

JIRA: NETCONF-945
Change-Id: I0d1b3631d2af50ca7291bfca06a9ddd490c26a71
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
index a1edec19eebd23eb0afb224a44fd12005538aba4..1a57fd33cc551ae0b169da73d0c8e7bb0d6a5bd9 100644 (file)
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
+++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
@@ -11,9 +11,9 @@ import static java.util.Objects.requireNonNull;
 
 import io.netty.channel.EventLoopGroup;
 import java.util.Map;
-import org.opendaylight.netconf.api.NetconfServerDispatcher;
 import org.opendaylight.netconf.server.NetconfServerDispatcherImpl;
 import org.opendaylight.netconf.server.ServerChannelInitializer;
+import org.opendaylight.netconf.server.api.NetconfServerDispatcher;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 

diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml
index bd0837b5ee5bfc99145f61b45405bfa355177f84..ddd7e397514058d3b8633ad25cd5e6c23c422abd 100644 (file)
--- a/netconf/mdsal-netconf-ssh/pom.xml
+++ b/netconf/mdsal-netconf-ssh/pom.xml
@@ -53,6 +53,10 @@
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>netconf-netty-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>netconf-server</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>shaded-sshd</artifactId>

diff --git a/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java
index 80916d391858c776dba0d5433af0127dc63bcd07..da8fd6410a4fcc65ab15e46f251e115f642f788f 100644 (file)
--- a/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java
+++ b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java
@@ -14,8 +14,8 @@ import io.netty.util.concurrent.EventExecutor;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
-import org.opendaylight.netconf.api.NetconfServerDispatcher;
 import org.opendaylight.netconf.auth.AuthProvider;
+import org.opendaylight.netconf.server.api.NetconfServerDispatcher;
 import org.opendaylight.netconf.shaded.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.osgi.service.component.annotations.Activate;

diff --git a/netconf/mdsal-netconf-tcp/pom.xml b/netconf/mdsal-netconf-tcp/pom.xml
index d5b9b928fa3ca5b40d559ebc4238f65f04b5d2ed..6993c94cbbac2c6346cca0f5e6f393c20e482631 100644 (file)
--- a/netconf/mdsal-netconf-tcp/pom.xml
+++ b/netconf/mdsal-netconf-tcp/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-api</artifactId>
+      <artifactId>netconf-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java b/netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java
index 7e8a1d0fbea06e2eb8e4c320f460eee817c67a83..b1fe4a48d2846c7ecdbc86d5a9273cb5969baca7 100644 (file)
--- a/netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java
+++ b/netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java
@@ -9,7 +9,7 @@ package org.opendaylight.netconf.tcp;
 
 import io.netty.channel.ChannelFuture;
 import java.net.InetSocketAddress;
-import org.opendaylight.netconf.api.NetconfServerDispatcher;
+import org.opendaylight.netconf.server.api.NetconfServerDispatcher;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java
index 70a2c91cb191df1f9506af5f63fabeb4f9aaf667..1caee81d39b59640725402bc2a90f56952fbc8f1 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java
@@ -12,8 +12,8 @@ import io.netty.channel.EventLoopGroup;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.local.LocalServerChannel;
 import java.net.InetSocketAddress;
-import org.opendaylight.netconf.api.NetconfServerDispatcher;
 import org.opendaylight.netconf.nettyutil.AbstractNetconfDispatcher;
+import org.opendaylight.netconf.server.api.NetconfServerDispatcher;
 
 public class NetconfServerDispatcherImpl extends AbstractNetconfDispatcher<NetconfServerSession,
         NetconfServerSessionListener> implements NetconfServerDispatcher {

diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/NetconfServerDispatcher.java
similarity index 92%
rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/NetconfServerDispatcher.java
index b2775fd1e75e8f4199ce3253ca10f3493cbb95cb..9153fe946152fe83a6f9aa8707134903b157fd8c 100644 (file)
--- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/NetconfServerDispatcher.java
@@ -5,8 +5,7 @@
  * 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.api;
+package org.opendaylight.netconf.server.api;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.local.LocalAddress;