Move NetconfMapperAggregator

NetconfMapperAggregator is well-known among the various implementations
for its aggregation capability. Move it one layer down, so it gets
provided by netconf-server-mdsal, allowing more services to be moved
there.

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

diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/MapperAggregatorRegistry.java
similarity index 84%
rename from netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/MapperAggregatorRegistry.java
index ff23c24f4084ecf4327b7a872ae80a9d64735c4d..2deb6218a57f77544d9d6891da048da03033ca0b 100644 (file)
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/MapperAggregatorRegistry.java
@@ -5,7 +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.impl.mdsal;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener;
@@ -16,9 +16,9 @@ import org.osgi.service.component.annotations.Deactivate;
 
 @Component(service = { NetconfOperationServiceFactory.class, NetconfOperationServiceFactoryListener.class },
            property = "type=mapper-aggregator-registry", immediate = true)
-public final class NetconfMapperAggregator extends AggregatedNetconfOperationServiceFactory {
+public final class MapperAggregatorRegistry extends AggregatedNetconfOperationServiceFactory {
     @Activate
-    public NetconfMapperAggregator() {
+    public MapperAggregatorRegistry() {
         super();
     }
 

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.java
index fd567a15949bc00a516a568c74478fdc46a4103f..9a68d81fd752b6e561d5ec6918398cd6d68ea370 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.java
@@ -15,7 +15,6 @@ import org.w3c.dom.Document;
  * Wraps the execution of a single netconf operation.
  */
 public interface NetconfOperationChainedExecution {
-
     /**
      * Check if this is termination point in operation execution.
      *
@@ -37,11 +36,9 @@ public interface NetconfOperationChainedExecution {
         }
 
         @Override
-        public Document execute(Document requestMessage) {
+        public Document execute(final Document requestMessage) {
             throw new IllegalStateException("This execution represents the termination point in operation execution "
                     + "and cannot be executed itself");
         }
     };
-
-
 }

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java
index 9a5c4cc42fc0d2f56b503cb810d9b56e362820b8..550e792522d330c0ae3326066a4fd092c292892b 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java
@@ -5,7 +5,6 @@
  * 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.server.api.operations;
 
 public interface NetconfOperationServiceFactoryListener {
@@ -13,6 +12,4 @@ public interface NetconfOperationServiceFactoryListener {
     void onAddNetconfOperationServiceFactory(NetconfOperationServiceFactory service);
 
     void onRemoveNetconfOperationServiceFactory(NetconfOperationServiceFactory service);
-
-
 }

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java
index 5d384677ddc474eb6a306ac469a3387536e2bb65..87ee7c159754a917a2d88358bd456189354b5b8f 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java
@@ -5,7 +5,6 @@
  * 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.server.api.operations;
 
 import org.opendaylight.netconf.api.NetconfSession;