Rename netconf-server-mdsal packages

The base package should be netconf.server.mdsal, refactor code to make
that a reality.

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

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
index fb28e5dd03315fb4e2ed63369323214cb324f91b..a4512c9aca2c7c7a85ec23996039874513809726 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
@@ -24,20 +24,20 @@ import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker;
 import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory;
 import org.opendaylight.netconf.api.capability.Capability;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
-import org.opendaylight.netconf.mdsal.connector.ops.Commit;
-import org.opendaylight.netconf.mdsal.connector.ops.DiscardChanges;
-import org.opendaylight.netconf.mdsal.connector.ops.EditConfig;
-import org.opendaylight.netconf.mdsal.connector.ops.Lock;
-import org.opendaylight.netconf.mdsal.connector.ops.Unlock;
-import org.opendaylight.netconf.mdsal.connector.ops.get.Get;
-import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig;
 import org.opendaylight.netconf.server.api.SessionIdProvider;
 import org.opendaylight.netconf.server.api.monitoring.CapabilityListener;
 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.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.operations.Commit;
+import org.opendaylight.netconf.server.mdsal.operations.DiscardChanges;
+import org.opendaylight.netconf.server.mdsal.operations.EditConfig;
+import org.opendaylight.netconf.server.mdsal.operations.Get;
+import org.opendaylight.netconf.server.mdsal.operations.GetConfig;
+import org.opendaylight.netconf.server.mdsal.operations.Lock;
+import org.opendaylight.netconf.server.mdsal.operations.Unlock;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/CurrentSchemaContext.java
similarity index 98%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/CurrentSchemaContext.java
index cd542c1d5fd491023747195cc5e956fd8f96dbb3..a3af185f3cfd6cf2762681caa5dbb6b2ee43398e 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/CurrentSchemaContext.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.mdsal.connector;
+package org.opendaylight.netconf.server.mdsal;
 
 import static com.google.common.base.Preconditions.checkState;
 

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/DOMDataTransactionValidator.java
similarity index 98%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/DOMDataTransactionValidator.java
index 1c3e71aabf863ef47f18e1d9f540505700168ebf..c0d8650c458b21e4c1ecf1aaddc0299a566a5321 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/DOMDataTransactionValidator.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.mdsal.connector;
+package org.opendaylight.netconf.server.mdsal;
 
 import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.FluentFuture;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/MdsalNetconfOperationService.java
similarity index 74%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/MdsalNetconfOperationService.java
index 598c0f72912146beeaa2f644b90aa8e57e6e523d..4ddc8368656ada0f3dde0035a463b4260872e07c 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/MdsalNetconfOperationService.java
@@ -5,23 +5,23 @@
  * 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.mdsal.connector;
+package org.opendaylight.netconf.server.mdsal;
 
 import com.google.common.collect.ImmutableSet;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.netconf.mdsal.connector.ops.Commit;
-import org.opendaylight.netconf.mdsal.connector.ops.CopyConfig;
-import org.opendaylight.netconf.mdsal.connector.ops.DiscardChanges;
-import org.opendaylight.netconf.mdsal.connector.ops.EditConfig;
-import org.opendaylight.netconf.mdsal.connector.ops.Lock;
-import org.opendaylight.netconf.mdsal.connector.ops.RuntimeRpc;
-import org.opendaylight.netconf.mdsal.connector.ops.Unlock;
-import org.opendaylight.netconf.mdsal.connector.ops.Validate;
-import org.opendaylight.netconf.mdsal.connector.ops.get.Get;
-import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig;
 import org.opendaylight.netconf.server.api.operations.NetconfOperation;
 import org.opendaylight.netconf.server.api.operations.NetconfOperationService;
+import org.opendaylight.netconf.server.mdsal.operations.Commit;
+import org.opendaylight.netconf.server.mdsal.operations.CopyConfig;
+import org.opendaylight.netconf.server.mdsal.operations.DiscardChanges;
+import org.opendaylight.netconf.server.mdsal.operations.EditConfig;
+import org.opendaylight.netconf.server.mdsal.operations.Get;
+import org.opendaylight.netconf.server.mdsal.operations.GetConfig;
+import org.opendaylight.netconf.server.mdsal.operations.Lock;
+import org.opendaylight.netconf.server.mdsal.operations.RuntimeRpc;
+import org.opendaylight.netconf.server.mdsal.operations.Unlock;
+import org.opendaylight.netconf.server.mdsal.operations.Validate;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 
 final class MdsalNetconfOperationService implements NetconfOperationService {

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/MdsalNetconfOperationServiceFactory.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/MdsalNetconfOperationServiceFactory.java
index 6864aaf0d8db47f8c613cf7b32005811440119f3..1eef723de63d2d54142fb4c8bade8bda4c4396ed 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/MdsalNetconfOperationServiceFactory.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.mdsal.connector;
+package org.opendaylight.netconf.server.mdsal;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/TransactionProvider.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/TransactionProvider.java
index 57f11ac8cf797c24032b925a07202d47908ea979..11bfb7b2a500abc6ee22f8e889ee895bdfb0d1ce 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/TransactionProvider.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.mdsal.connector;
+package org.opendaylight.netconf.server.mdsal;
 
 import com.google.common.util.concurrent.FluentFuture;
 import java.util.ArrayList;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractConfigOperation.java
similarity index 98%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractConfigOperation.java
index 803f07b35f2a4b288d8b706cadfeee5c4fc17256..634bfbe9e8e8a0ef470970a27f5c8fbb943e6cd6 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractConfigOperation.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractEdit.java
similarity index 98%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractEdit.java
index 2147dc094108a0a835a014b84fd9bd33a196ed7d..3125584f32d42a8f2b86192f3870be2f27b1dc3e 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractEdit.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
@@ -17,7 +17,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractGet.java
similarity index 97%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractGet.java
index dc334742b808cd792e7ac96b8935eea65f6e3915..cac853f207e5b4b2deae285e5c7f275af31d5251 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractGet.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -19,9 +19,8 @@ import javax.xml.transform.dom.DOMResult;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.ops.Datastore;
 import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Commit.java
similarity index 93%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Commit.java
index aa5099b5689affd6fb84139ce9ae429c58134241..4093751d01438264b563405f1a099d3bac2b4402 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Commit.java
@@ -5,15 +5,15 @@
  * 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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static java.util.Objects.requireNonNull;
 
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
 import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/ComponentNormalizedNodeStreamWriter.java
similarity index 94%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/ComponentNormalizedNodeStreamWriter.java
index 7a1bcf0e71754bb54f35e1a52babef9eb2f1d65f..67eb5f7a4f63e3ec1ce8e53464a63051b2c37431 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/ComponentNormalizedNodeStreamWriter.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableMetadataNormalizedNodeStreamWriter;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.java
similarity index 98%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.java
index c22f79a304651e537d6e790de7a1ccf9f67ca1a5..fdab94dee424b1456ca76f0b9021cd9a2062de43 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfig.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0;
 
@@ -29,8 +29,8 @@ import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.java
similarity index 96%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.java
index 9118257c9adeb82e71ab97c5f521ae5d75851897..d17a011adc04169df6b8e0007ae8166dc30ea9a2 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Datastore.java
similarity index 88%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Datastore.java
index 671fadfc3bfd07bfb79acf4cf20c4928e8bdd646..c29b144da79b206257218f70b2921bbc1c5e9454 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Datastore.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 // FIXME: document, rename to LegacyDatastore (as per NMDA), add XML interaction values
 public enum Datastore {

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DiscardChanges.java
similarity index 95%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DiscardChanges.java
index a8c1f419dc4b40db324ecba2df672ecc9cb8467e..06ff8ea456b39304692c55f43e98e711f931a6da 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DiscardChanges.java
@@ -5,15 +5,15 @@
  * 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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import java.util.HashMap;
 import java.util.Map;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
 import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/EditConfig.java
similarity index 97%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/EditConfig.java
index f258ed08b59ac4628ca87b0fc49ce6bee2ed3b5c..71912537e0bfab6843c7cd915caeb49464924573 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/EditConfig.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static java.util.Objects.requireNonNull;
 
@@ -18,8 +18,8 @@ import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.EffectiveOperation;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/FilterContentValidator.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/FilterContentValidator.java
index 78e63133a20838906796c04302cff9d2dcba18d5..f06b479681001786178ef67f6f32d25d14d0f8c3 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/FilterContentValidator.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.opendaylight.yangtools.yang.data.util.ParserStreamUtils.findSchemaNodeByNameAndNamespace;
 
@@ -22,7 +22,7 @@ import javax.xml.stream.XMLStreamWriter;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.MissingNameSpaceException;
 import org.opendaylight.netconf.api.xml.XmlElement;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Get.java
similarity index 93%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Get.java
index fbd62b483c7d9ef01f201eae3ae5003f602af51b..a0e050fa80f53d31b9b78a93b9c0c7f4c0a52b5a 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Get.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -14,8 +14,8 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/GetConfig.java
similarity index 94%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/GetConfig.java
index 17e56e92f21fb36909c447a25d63c661cd1b1533..61f3f88d250f6c9b2040d5b9fcbfb2cb6abd0d26 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/GetConfig.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -14,9 +14,8 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
-import org.opendaylight.netconf.mdsal.connector.ops.Datastore;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Lock.java
similarity index 91%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Lock.java
index 8babfc42bdf133c2b4238cb7b8b256b0cab8d446..e394cff6fb151c12eab607bb254730065ee905cf 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Lock.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
@@ -20,10 +20,6 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-/* FIXME Duplicated code
-   netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/
-   confignetconfconnector/operations/Lock.java
- */
 public class Lock extends AbstractSingletonNetconfOperation {
     private static final Logger LOG = LoggerFactory.getLogger(Lock.class);
     private static final String OPERATION_NAME = "lock";

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpc.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpc.java
index 925d158c85db0323a87e3bbd69741d359844bb42..1e3efd4b59aa26f0ec5cc8606838d1c05625ca21 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpc.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -25,10 +25,10 @@ import org.opendaylight.netconf.api.NetconfDocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
 import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation;
 import org.opendaylight.netconf.server.api.operations.HandlingPriority;
 import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/SplittingNormalizedNodeMetadataStreamWriter.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/SplittingNormalizedNodeMetadataStreamWriter.java
index 6fa2f6e34ffa795a0e1578f8dd4c1bc1829ede98..14c0129dc6d772ae93c2d9d5a40a7fe466ff30c4 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/SplittingNormalizedNodeMetadataStreamWriter.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/UniversalNamespaceContextImpl.java
similarity index 98%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/UniversalNamespaceContextImpl.java
index 479a94b21690cd4ecd76b4afcaa33b03baf6ac67..99d5bdffcb1f122e01f85106d27700cf13482ea4 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/UniversalNamespaceContextImpl.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import java.util.HashMap;
 import java.util.Iterator;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Unlock.java
similarity index 97%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Unlock.java
index 2d28666ea23aeeb7ba0c7ce86ff11f68adabd98f..4a2da1f3c187e1c041c8f5352963536c2785a41c 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Unlock.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;

diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Validate.java
similarity index 96%
rename from plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java
rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Validate.java
index a6f2539511376ca9e2c078717c197058d1803167..2aeb76575632e0f9eb63d10cc7931e4fb01d2611 100644 (file)
--- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java
+++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/Validate.java
@@ -5,13 +5,13 @@
  * 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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import com.google.common.collect.ImmutableMap;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/AbstractNetconfOperationTest.java
similarity index 97%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/AbstractNetconfOperationTest.java
index 08220c013feeedc1845743848dc95c428b1c007a..f9898c5adc1c66babe5c96babaa0abb921c47993 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/AbstractNetconfOperationTest.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -40,12 +40,10 @@ import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker;
 import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
-import org.opendaylight.netconf.mdsal.connector.ops.get.Get;
-import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig;
 import org.opendaylight.netconf.server.api.operations.NetconfOperation;
 import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.netconf.test.util.NetconfXmlUnitRecursiveQualifier;
 import org.opendaylight.netconf.test.util.XmlFileLoader;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Bug8084.java
similarity index 96%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Bug8084.java
index 7dcc3cb382f2514582b3a1f26b5593b94027881a..d3c9b684ab37b17bded58b3cc1319f11f48d852d 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Bug8084.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;
@@ -17,7 +17,7 @@ import java.math.BigInteger;
 import org.junit.Test;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfigTest.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfigTest.java
index c23833535c6d109dc992de12303c757a5c45342d..549a2273fbf0700990f7dca7e4543b63edc5c83c 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/CopyConfigTest.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/FilterContentValidatorTest.java
similarity index 97%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/FilterContentValidatorTest.java
index c2969795fbe4f86bcafa7bcbae8b1bf66615cce1..d59113a3d31885129957e0b8997c3d44f0d32da9 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/FilterContentValidatorTest.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static java.util.Objects.requireNonNull;
 import static org.hamcrest.CoreMatchers.startsWith;
@@ -31,7 +31,7 @@ import org.junit.runners.model.InitializationError;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Netconf506Test.java
similarity index 93%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Netconf506Test.java
index 3b3f8c474db9059c62a51e084b2863ea23ff4ad6..02e490d3fef3017f90798c22bbf3a932b3d668bf 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Netconf506Test.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;
@@ -14,7 +14,7 @@ import static org.mockito.Mockito.mock;
 import org.junit.Test;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Netconf538Test.java
similarity index 94%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Netconf538Test.java
index a4add96ceffd16b4ad4ded490d66e0e06de5de17..97ed1c50436d23f33a337ad60bdbe6565f215325 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/Netconf538Test.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.mdsal.connector.ops.get;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -15,8 +15,8 @@ import static org.mockito.Mockito.mock;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint32;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/NetconfMDSalMappingTest.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/NetconfMDSalMappingTest.java
index e6243b81ecd17bd14aa21dc4cdcb14a5a9d144f1..bb24fc45f482f6ba3d7f96385da75d8217b34eda 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/NetconfMDSalMappingTest.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
@@ -17,9 +17,8 @@ import org.junit.Test;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
-import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.netconf.test.util.XmlFileLoader;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpcTest.java
similarity index 99%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpcTest.java
index ccc1ce5ad5059329b0441ee69d6fc83614b111b5..38c8f55157b7d3690490916498bec342b107b75d 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpcTest.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
@@ -42,9 +42,9 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
 import org.opendaylight.netconf.server.api.operations.HandlingPriority;
 import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution;
+import org.opendaylight.netconf.server.mdsal.CurrentSchemaContext;
 import org.opendaylight.netconf.test.util.XmlFileLoader;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/SchemaServiceStub.java
similarity index 96%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/SchemaServiceStub.java
index 495ebca85572728019af0353f679e4742b02baaa..7124ad10d2f4acfd0a6191841568ef4270b3d68d 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/SchemaServiceStub.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.java
similarity index 88%
rename from plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java
rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.java
index 891254bef1eac36ceb04cafdcf5fe67872dec701..1d43adcdfc68bcdd12cf8c36569c43e3d0665de7 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.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.mdsal.connector.ops;
+package org.opendaylight.netconf.server.mdsal.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
@@ -13,10 +13,10 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperationTest.RPC_REPLY_OK;
-import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperationTest.SESSION_ID_FOR_REPORTING;
-import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperationTest.executeOperation;
-import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperationTest.verifyResponse;
+import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOperationTest.RPC_REPLY_OK;
+import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOperationTest.SESSION_ID_FOR_REPORTING;
+import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOperationTest.executeOperation;
+import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOperationTest.verifyResponse;
 
 import com.google.common.collect.ImmutableClassToInstanceMap;
 import org.custommonkey.xmlunit.XMLUnit;
@@ -28,9 +28,9 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.netconf.api.DocumentedException;
-import org.opendaylight.netconf.mdsal.connector.DOMDataTransactionValidator;
-import org.opendaylight.netconf.mdsal.connector.DOMDataTransactionValidator.ValidationFailedException;
-import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
+import org.opendaylight.netconf.server.mdsal.DOMDataTransactionValidator;
+import org.opendaylight.netconf.server.mdsal.DOMDataTransactionValidator.ValidationFailedException;
+import org.opendaylight.netconf.server.mdsal.TransactionProvider;
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;