Promote Databind{Context,Provider}

DatabindContext provides a number of YANG/NormalizedNode conveniences
which we could use across the project. Move it to netconf-common for
wider accessibility.

DatabindProvider is a simplistic interface, which we take along for the
ride from restconf-server-spi.

Change-Id: I47dfc6b3ca681ddcdd649ac732b9f56adcc39663
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/apps/odl-device-notification/pom.xml b/apps/odl-device-notification/pom.xml
index bd041511c34cd37331f9476e38cc716acb6c323b..9df9263322f3db0c614283453894a2a2bbcd9507 100644 (file)
--- a/apps/odl-device-notification/pom.xml
+++ b/apps/odl-device-notification/pom.xml
@@ -41,6 +41,10 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991-ietf-inet-types</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>restconf-api</artifactId>

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/AbstractRestconfStrategyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/AbstractRestconfStrategyTest.java
index 8bdb65f9ce3dfd80c55ad62ee55b5ca741a1a029..f3b77dfa099b9e5b5259afa78a402f4cf8fa6d1e 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/AbstractRestconfStrategyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/AbstractRestconfStrategyTest.java
@@ -22,12 +22,12 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.query.ContentParam;
 import org.opendaylight.restconf.server.api.DataPatchResult;
 import org.opendaylight.restconf.server.api.DataPostResult;
 import org.opendaylight.restconf.server.api.DataPutResult;
 import org.opendaylight.restconf.server.api.DataYangPatchResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.PatchContext;
 import org.opendaylight.restconf.server.api.PatchEntity;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategyTest.java
index 165a5ed338e1da55a5eb5471cd6779d5244e3787..245548a14e221c4a5590a035ce215eedcb5346ff 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategyTest.java
@@ -43,6 +43,7 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
 import org.opendaylight.restconf.api.ApiPath;
@@ -51,7 +52,6 @@ import org.opendaylight.restconf.api.query.WithDefaultsParam;
 import org.opendaylight.restconf.mdsal.spi.DOMServerRpcOperations;
 import org.opendaylight.restconf.mdsal.spi.DOMServerStrategy;
 import org.opendaylight.restconf.server.api.DataGetResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.PatchStatusContext;
 import org.opendaylight.restconf.server.api.PatchStatusEntity;
 import org.opendaylight.restconf.server.api.ServerException;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategyTest.java
index b38575f31031d9dc6b2fbf90e4f07f199453e82a..169433e2af29a850a17b8214370471a6c35e2cc8 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategyTest.java
@@ -33,6 +33,7 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
 import org.opendaylight.restconf.api.ApiPath;
@@ -44,7 +45,6 @@ import org.opendaylight.restconf.api.query.PointParam;
 import org.opendaylight.restconf.api.query.PrettyPrintParam;
 import org.opendaylight.restconf.server.api.DataPostResult;
 import org.opendaylight.restconf.server.api.DataPutResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.JsonDataPostBody;
 import org.opendaylight.restconf.server.api.JsonResourceBody;
 import org.opendaylight.restconf.server.api.PatchStatusContext;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java
index 3fca59439491d593f1ca305ef1972c3cbfbab84f..6728c78e6a686830f34fbc127cf03264526843d5 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java
@@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Action;
 import org.opendaylight.restconf.server.api.DatabindPath.Rpc;
 import org.opendaylight.restconf.server.api.OperationInputBody;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java
index 08522cca0fc1f634fe6d48170f995d21730ac976..2c1990525e995d45f8ca50639f333d137d0bd926 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java
@@ -23,10 +23,10 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.mdsal.spi.data.MdsalRestconfStrategy;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ResourceBody;
 import org.opendaylight.restconf.server.api.ServerError;
 import org.opendaylight.restconf.server.api.ServerException;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java
index f000ba1dfb9d1768ee4cd5d5b24af8f8f2feed6b..7521ea4e29accfc3bb5318f069d529ae6b3ab6c7 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java
@@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.List;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath;
 import org.opendaylight.restconf.server.api.JsonChildBody;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java
index bed8431fd2b5225c6ff26aeb84c4deb528c93d62..16a29f0281079dffc5345d97945895b7a082f85d 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java
@@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.List;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.XmlChildBody;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/YangErrorsBodyTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/YangErrorsBodyTest.java
index bfecac57080ba00da13160ab9330bcb085e93ae0..cab9c091a76c82f2bfa20fb5c1769cdb1141e45b 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/YangErrorsBodyTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/YangErrorsBodyTest.java
@@ -9,8 +9,8 @@ package org.opendaylight.restconf.nb.rfc8040.databind;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerError;
 import org.opendaylight.restconf.server.api.ServerErrorInfo;
 import org.opendaylight.restconf.server.api.ServerErrorPath;

diff --git a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java
index 5f9d69b5aabffa26800386d81c9518a7f2c20e6a..f8367fb7005097c00e0041eb70291203898391cb 100644 (file)
--- a/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java
+++ b/apps/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/DataTreeChangeStreamTest.java
@@ -32,6 +32,7 @@ import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBro
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.netconf.sal.remote.impl.DataTreeChangeSource;
 import org.opendaylight.restconf.api.query.ChangedLeafNodesOnlyParam;
 import org.opendaylight.restconf.api.query.ChildNodesOnlyParam;
@@ -41,7 +42,6 @@ import org.opendaylight.restconf.server.api.EventStreamGetParams;
 import org.opendaylight.restconf.server.api.testlib.AbstractInstanceIdentifierTest;
 import org.opendaylight.restconf.server.api.testlib.CompletingServerRequest;
 import org.opendaylight.restconf.server.mdsal.MdsalRestconfStreamRegistry;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
 import org.opendaylight.restconf.server.spi.RestconfStream;
 import org.opendaylight.restconf.server.spi.RestconfStream.EncodingName;
 import org.opendaylight.restconf.server.spi.RestconfStream.Sender;

diff --git a/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpc.java b/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpc.java
index d40bf3af34b2919ba2000bcdb7ce7d96b8e05dae..9c7da4b4bf8e63b5a7c2988b7f3065a618f4f447 100644 (file)
--- a/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpc.java
+++ b/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpc.java
@@ -16,11 +16,11 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.restconf.server.api.ServerRequest;
 import org.opendaylight.restconf.server.spi.ApiPathCanonizer;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
 import org.opendaylight.restconf.server.spi.OperationInput;
 import org.opendaylight.restconf.server.spi.RestconfStream;
 import org.opendaylight.restconf.server.spi.RpcImplementation;

diff --git a/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateNotificationStreamRpc.java b/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateNotificationStreamRpc.java
index e73819feae3c36d7aef153ab145cc889d6d527c3..71653fd97c50d4882f012240cb5d482624f9461a 100644 (file)
--- a/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateNotificationStreamRpc.java
+++ b/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/CreateNotificationStreamRpc.java
@@ -14,10 +14,10 @@ import java.net.URI;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.restconf.mdsal.spi.NotificationSource;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.restconf.server.api.ServerRequest;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
 import org.opendaylight.restconf.server.spi.OperationInput;
 import org.opendaylight.restconf.server.spi.RestconfStream;
 import org.opendaylight.restconf.server.spi.RpcImplementation;

diff --git a/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/DataTreeChangeSource.java b/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/DataTreeChangeSource.java
index 623d61084673771c2d1f3c64c1e549aef0341c60..303c539f7480dd07d21f09e31b4ef2abcaf1c7f1 100644 (file)
--- a/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/DataTreeChangeSource.java
+++ b/apps/sal-remote-impl/src/main/java/org/opendaylight/netconf/sal/remote/impl/DataTreeChangeSource.java
@@ -19,7 +19,7 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.restconf.server.spi.RestconfStream;
 import org.opendaylight.restconf.server.spi.RestconfStream.EncodingName;
 import org.opendaylight.restconf.server.spi.RestconfStream.Sink;

diff --git a/apps/sal-remote-impl/src/test/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpcTest.java b/apps/sal-remote-impl/src/test/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpcTest.java
index 564078ce490e2455f041ac96e14d11768704c23b..987ee01b1356c299adfd8fb4b79a9e30d2a88846 100644 (file)
--- a/apps/sal-remote-impl/src/test/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpcTest.java
+++ b/apps/sal-remote-impl/src/test/java/org/opendaylight/netconf/sal/remote/impl/CreateDataChangeEventSubscriptionRpcTest.java
@@ -35,13 +35,13 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.netconf.common.DatabindContext;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.netconf.common.ErrorMessage;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.restconf.server.api.testlib.CompletingServerRequest;
 import org.opendaylight.restconf.server.mdsal.MdsalRestconfStreamRegistry;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
 import org.opendaylight.restconf.server.spi.OperationInput;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.monitoring.rev170126.restconf.state.streams.stream.Access;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.CreateDataChangeEventSubscription;

diff --git a/plugins/restconf-mdsal-spi/pom.xml b/plugins/restconf-mdsal-spi/pom.xml
index 30d3473be79b466485e2b847414363690aed660d..80b50294ad422293a27737d4e47905ea96ca64d6 100644 (file)
--- a/plugins/restconf-mdsal-spi/pom.xml
+++ b/plugins/restconf-mdsal-spi/pom.xml
@@ -69,6 +69,10 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-dom-api</artifactId>

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/NotificationSource.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/NotificationSource.java
index 41d2afeaf62477e06cf0acd3c5b53e07c3b5b7ed..33574846d0cc5599204bf90412a04111e2cc6465 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/NotificationSource.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/NotificationSource.java
@@ -14,7 +14,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.restconf.server.spi.RestconfStream.EncodingName;
 import org.opendaylight.restconf.server.spi.RestconfStream.Sink;
 import org.opendaylight.restconf.server.spi.RestconfStream.Source;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/ExistenceCheck.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/ExistenceCheck.java
index 069846440b153d76119b981e21b9d78f9e209b0e..1d82fb2d771ba993f4bf0ef3b9ded25fd3fd5cc6 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/ExistenceCheck.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/ExistenceCheck.java
@@ -22,7 +22,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadOperations;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerError;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategy.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategy.java
index ec4d458870005200b42f371300fbc15a8ddf6274..0aa8e030372eff7fe1986bd4c6fceebc44ce0503 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategy.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfStrategy.java
@@ -21,9 +21,9 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.server.api.DataGetParams;
 import org.opendaylight.restconf.server.api.DataGetResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.ServerErrorPath;
 import org.opendaylight.restconf.server.api.ServerException;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfTransaction.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfTransaction.java
index 9807645bd4b88e566869860fed0910311931495d..b2f1d6aff2477e8e00dd3333fca9803b4af34ce0 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfTransaction.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/MdsalRestconfTransaction.java
@@ -20,9 +20,9 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.mdsal.spi.data.ExistenceCheck.Conflict;
 import org.opendaylight.restconf.mdsal.spi.data.ExistenceCheck.Result;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerErrorPath;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategy.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategy.java
index d68bbf1fed19b1ab6ffe1d33666e1305f13abbee..f20edaf3ac978751b3dcdab0681adc6e437dae70 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategy.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfStrategy.java
@@ -27,6 +27,7 @@ import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
 import org.opendaylight.restconf.api.query.ContentParam;
 import org.opendaylight.restconf.api.query.FieldsParam;
@@ -34,7 +35,6 @@ import org.opendaylight.restconf.api.query.FieldsParam.NodeSelector;
 import org.opendaylight.restconf.api.query.WithDefaultsParam;
 import org.opendaylight.restconf.server.api.DataGetParams;
 import org.opendaylight.restconf.server.api.DataGetResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.restconf.server.api.ServerRequest;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfTransaction.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfTransaction.java
index 9b95db5bea54e5c01fe6a7448e18afb39859217e..6f05179777c3084ab7bd5ebb66997165a8315e16 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfTransaction.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/NetconfRestconfTransaction.java
@@ -34,8 +34,8 @@ import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfStrategy.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfStrategy.java
index c31aaaad889ca694f86ed60be5ffb501973e2c2c..a1dbf5df8607cb778339e551f50d8bc884666aab 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfStrategy.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfStrategy.java
@@ -35,6 +35,7 @@ import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.query.ContentParam;
 import org.opendaylight.restconf.api.query.WithDefaultsParam;
@@ -44,7 +45,6 @@ import org.opendaylight.restconf.server.api.DataGetResult;
 import org.opendaylight.restconf.server.api.DataPatchResult;
 import org.opendaylight.restconf.server.api.DataPutResult;
 import org.opendaylight.restconf.server.api.DataYangPatchResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.PatchContext;
 import org.opendaylight.restconf.server.api.PatchStatusContext;

diff --git a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfTransaction.java b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfTransaction.java
index c94bb54b8d4ec5f2f4a39b493dbd6a507ea09fc6..1ecbed0a83dc37256fe58057bf82452fcc57d3a4 100644 (file)
--- a/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfTransaction.java
+++ b/plugins/restconf-mdsal-spi/src/main/java/org/opendaylight/restconf/mdsal/spi/data/RestconfTransaction.java
@@ -14,8 +14,8 @@ import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.odlparent.logging.markers.Markers;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;

diff --git a/plugins/restconf-server-mdsal/pom.xml b/plugins/restconf-server-mdsal/pom.xml
index dd7c699347efc06f3310570c2ede1702bef9b452..ec1635f01f82ac78a7ea1440b12bfc90eeb6cb08 100644 (file)
--- a/plugins/restconf-server-mdsal/pom.xml
+++ b/plugins/restconf-server-mdsal/pom.xml
@@ -65,6 +65,10 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-dom-api</artifactId>

diff --git a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalDatabindProvider.java b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalDatabindProvider.java
index 2e6d5cec8e2e57b142677c31af56344f0c96118d..290a10d0fe605fbc15d102011e440a3db2c7bbe8 100644 (file)
--- a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalDatabindProvider.java
+++ b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalDatabindProvider.java
@@ -19,8 +19,8 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService.YangTextSourceExtension;
-import org.opendaylight.restconf.server.api.DatabindContext;
-import org.opendaylight.restconf.server.spi.DatabindProvider;
+import org.opendaylight.netconf.common.DatabindContext;
+import org.opendaylight.netconf.common.DatabindProvider;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.osgi.service.component.annotations.Activate;

diff --git a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalMountPointResolver.java b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalMountPointResolver.java
index 6755d2b24f026fcb4311d434cc1ec2248dad487c..7a9d492711ac2ed5ff41a0a7a79279507e94d7c9 100644 (file)
--- a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalMountPointResolver.java
+++ b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalMountPointResolver.java
@@ -17,6 +17,7 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService.YangTextSourceExtension;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
 import org.opendaylight.restconf.mdsal.spi.DOMServerActionOperations;
 import org.opendaylight.restconf.mdsal.spi.DOMServerModulesOperations;
@@ -24,7 +25,6 @@ import org.opendaylight.restconf.mdsal.spi.DOMServerRpcOperations;
 import org.opendaylight.restconf.mdsal.spi.DOMServerStrategy;
 import org.opendaylight.restconf.mdsal.spi.data.MdsalRestconfStrategy;
 import org.opendaylight.restconf.mdsal.spi.data.NetconfRestconfStrategy;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.ServerErrorPath;
 import org.opendaylight.restconf.server.api.ServerException;

diff --git a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
index 699c7a3d0bea9fdbfdf15b374800bb0fa54e1a0c..7a371ef6b75170b85d7d6113ba91cb37bc938af6 100644 (file)
--- a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
+++ b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
@@ -26,6 +26,7 @@ import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.FormattableBody;
 import org.opendaylight.restconf.mdsal.spi.DOMServerActionOperations;
@@ -40,7 +41,6 @@ import org.opendaylight.restconf.server.api.DataPostBody;
 import org.opendaylight.restconf.server.api.DataPostResult;
 import org.opendaylight.restconf.server.api.DataPutResult;
 import org.opendaylight.restconf.server.api.DataYangPatchResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.InvokeResult;
 import org.opendaylight.restconf.server.api.ModulesGetResult;
 import org.opendaylight.restconf.server.api.OperationInputBody;

diff --git a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalServerStrategy.java b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalServerStrategy.java
index 27c5de549b4b1e6339c6c993ec03516b8eb80927..72b15d956f44c87b664051aaef71a9621451cdd2 100644 (file)
--- a/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalServerStrategy.java
+++ b/plugins/restconf-server-mdsal/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalServerStrategy.java
@@ -11,8 +11,8 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.FormattableBody;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.RestconfServer;
 import org.opendaylight.restconf.server.api.ServerRequest;
 import org.opendaylight.restconf.server.spi.AbstractServerStrategy;

diff --git a/protocol/netconf-common/pom.xml b/protocol/netconf-common/pom.xml
index bdd2cbc7aecafa2bd3609229af1d4f735fb41ac6..148b71a3ee9b86f91393e34866ccdd59d27e7170 100644 (file)
--- a/protocol/netconf-common/pom.xml
+++ b/protocol/netconf-common/pom.xml
@@ -22,6 +22,11 @@
     <description>Shared NETCONF protocol components</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -43,6 +48,10 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jdt</groupId>
             <artifactId>org.eclipse.jdt.annotation</artifactId>
@@ -55,6 +64,22 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>

diff --git a/protocol/netconf-common/src/main/java/module-info.java b/protocol/netconf-common/src/main/java/module-info.java
index 3b44c7c11ca6a77f850d3be6c601a9f9d4820914..d34fc0b2e1007d32cf8cda6bae5208b2b2d74cdf 100644 (file)
--- a/protocol/netconf-common/src/main/java/module-info.java
+++ b/protocol/netconf-common/src/main/java/module-info.java
@@ -12,6 +12,9 @@ module org.opendaylight.netconf.common {
 
     requires transitive io.netty.common;
     requires transitive org.opendaylight.yangtools.yang.common;
+    requires transitive org.opendaylight.yangtools.yang.data.codec.gson;
+    requires transitive org.opendaylight.yangtools.yang.data.codec.xml;
+    requires transitive org.opendaylight.yangtools.yang.data.util;
     requires transitive org.opendaylight.yangtools.yang.model.api;
     requires transitive org.opendaylight.netconf.api;
     requires com.google.common;
@@ -21,6 +24,7 @@ module org.opendaylight.netconf.common {
     requires static transitive java.annotation;
     requires static transitive javax.inject;
     requires static transitive org.eclipse.jdt.annotation;
+    requires static com.github.spotbugs.annotations;
     requires static org.osgi.annotation.bundle;
     requires static org.osgi.service.component.annotations;
     requires static org.osgi.service.metatype.annotations;

diff --git a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindContext.java b/protocol/netconf-common/src/main/java/org/opendaylight/netconf/common/DatabindContext.java
similarity index 96%
rename from protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindContext.java
rename to protocol/netconf-common/src/main/java/org/opendaylight/netconf/common/DatabindContext.java
index 3bb8035687f26564fd3e93f2a72ae41b5d71d884..e51982a1c95ba1896d02efd9962ef630701b5784 100644 (file)
--- a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindContext.java
+++ b/protocol/netconf-common/src/main/java/org/opendaylight/netconf/common/DatabindContext.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.restconf.server.api;
+package org.opendaylight.netconf.common;
 
 import static java.util.Objects.requireNonNull;
 
@@ -41,13 +41,10 @@ public final class DatabindContext {
 
     private final @NonNull MountPointContext mountContext;
 
-    @SuppressWarnings("unused")
     @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile DataSchemaContextTree schemaTree;
-    @SuppressWarnings("unused")
     @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile JSONCodecFactory jsonCodecs;
-    @SuppressWarnings("unused")
     @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile XmlCodecFactory xmlCodecs;
 

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java b/protocol/netconf-common/src/main/java/org/opendaylight/netconf/common/DatabindProvider.java
similarity index 85%
rename from protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java
rename to protocol/netconf-common/src/main/java/org/opendaylight/netconf/common/DatabindProvider.java
index b9291f9b8ef742beff22687f0ecfcdeba049c39e..5fc2f29a64efff45b1cd331943112c83a50b9ae9 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java
+++ b/protocol/netconf-common/src/main/java/org/opendaylight/netconf/common/DatabindProvider.java
@@ -5,10 +5,9 @@
  * 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.restconf.server.spi;
+package org.opendaylight.netconf.common;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.restconf.server.api.DatabindContext;
 
 /**
  * A service providing access to a {@link DatabindContext}.

diff --git a/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractInstanceIdentifierTest.java b/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractInstanceIdentifierTest.java
index 85cd2ad1031af794ac5b7923137709c346c9b37a..7c08aaa081cff92b3b5c085e1e70a7a990ce8b27 100644 (file)
--- a/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractInstanceIdentifierTest.java
+++ b/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractInstanceIdentifierTest.java
@@ -11,7 +11,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;

diff --git a/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractJukeboxTest.java b/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractJukeboxTest.java
index 4a25dcec45081c4e95060cd34493c3533bb34006..a29d210dc38e1e073fbbb993175c88217ea610e8 100644 (file)
--- a/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractJukeboxTest.java
+++ b/protocol/restconf-server-api-testlib/src/main/java/org/opendaylight/restconf/server/api/testlib/AbstractJukeboxTest.java
@@ -17,9 +17,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.query.PrettyPrintParam;
 import org.opendaylight.restconf.server.api.ChildBody.PrefixAndBody;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.yang.gen.v1.http.example.com.ns.augmented.jukebox.rev160505.AugmentedJukeboxData;
 import org.opendaylight.yang.gen.v1.http.example.com.ns.example.jukebox.rev150404.ExampleJukeboxData;

diff --git a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindAware.java b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindAware.java
index a131bdff1a0255638fd035d27973e30aff75d95c..797ea647f5d7425a41a39b4fa2ebfd30e3930e99 100644 (file)
--- a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindAware.java
+++ b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindAware.java
@@ -8,6 +8,7 @@
 package org.opendaylight.restconf.server.api;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.netconf.common.DatabindContext;
 
 /**
  * Common interface for contracts that provide a {@link DatabindContext} instance via {@link #databind()}.

diff --git a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindPath.java b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindPath.java
index 481514cd125ecab8013c37d73470d325ae200a8f..0b8ae2713ddeb3b95f53119e91ccf76b4e0f333c 100644 (file)
--- a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindPath.java
+++ b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/DatabindPath.java
@@ -10,6 +10,7 @@ package org.opendaylight.restconf.server.api;
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContext;

diff --git a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/RequestBody.java b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/RequestBody.java
index c343d434177a1de249e4d22f013ab0f8c3c7d1ca..724c8b295bc47a6f28eb44a5bb4a70ab494d837e 100644 (file)
--- a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/RequestBody.java
+++ b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/RequestBody.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.restconf.api.ConsumableBody;
 import org.opendaylight.yangtools.yang.common.ErrorTag;

diff --git a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerError.java b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerError.java
index 31afaf102385cff0291e9b1b157378e5a25c2685..ec8173596937c0469ca75a76730f61150efb069e 100644 (file)
--- a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerError.java
+++ b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerError.java
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.base.MoreObjects;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;

diff --git a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerErrorPath.java b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerErrorPath.java
index d8144b5ba2781bb94d0f85e63a26797d37a2ec98..4ad8ccfcaab6380562bb74ccff3c7c3a8edb07d9 100644 (file)
--- a/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerErrorPath.java
+++ b/protocol/restconf-server-api/src/main/java/org/opendaylight/restconf/server/api/ServerErrorPath.java
@@ -9,6 +9,7 @@ package org.opendaylight.restconf.server.api;
 
 import static java.util.Objects.requireNonNull;
 
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 

diff --git a/protocol/restconf-server-jaxrs/src/test/java/org/opendaylight/restconf/server/jaxrs/MappingServerRequestTest.java b/protocol/restconf-server-jaxrs/src/test/java/org/opendaylight/restconf/server/jaxrs/MappingServerRequestTest.java
index 59b83648a1959478c7aaedd172dcc431bfa9c9a2..87c1a4de4b5c0e54027b15d6983419626446206a 100644 (file)
--- a/protocol/restconf-server-jaxrs/src/test/java/org/opendaylight/restconf/server/jaxrs/MappingServerRequestTest.java
+++ b/protocol/restconf-server-jaxrs/src/test/java/org/opendaylight/restconf/server/jaxrs/MappingServerRequestTest.java
@@ -14,12 +14,12 @@ import static org.mockito.Mockito.verify;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.restconf.api.FormattableBody;
 import org.opendaylight.restconf.api.HttpStatusCode;
 import org.opendaylight.restconf.api.QueryParameters;
 import org.opendaylight.restconf.api.query.PrettyPrintParam;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerError;
 import org.opendaylight.restconf.server.api.ServerErrorInfo;
 import org.opendaylight.restconf.server.api.ServerErrorPath;

diff --git a/protocol/restconf-server-spi/src/main/java/module-info.java b/protocol/restconf-server-spi/src/main/java/module-info.java
index e57251f31f64aefd37086da98bda893bce1d202b..7c30e6fe2edc6e3c83e47fe10ba5862d345fbd3a 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/module-info.java
+++ b/protocol/restconf-server-spi/src/main/java/module-info.java
@@ -12,6 +12,7 @@ module org.opendaylight.restconf.server.spi {
     exports org.opendaylight.restconf.server.spi;
 
     requires transitive com.google.common;
+    requires transitive org.opendaylight.netconf.common;
     requires transitive org.opendaylight.restconf.api;
     requires transitive org.opendaylight.restconf.server.api;
     requires org.opendaylight.netconf.api;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AbstractServerStrategy.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AbstractServerStrategy.java
index b4605f6552dd147b73aa3c780debfe3a94c2bfe6..00b1235ea9cb427c0a0930a53943a5dc9e596c3e 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AbstractServerStrategy.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AbstractServerStrategy.java
@@ -13,6 +13,7 @@ import com.google.common.annotations.Beta;
 import java.net.URI;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.FormattableBody;
 import org.opendaylight.restconf.api.query.ContentParam;
@@ -26,7 +27,6 @@ import org.opendaylight.restconf.server.api.DataPostBody;
 import org.opendaylight.restconf.server.api.DataPostResult;
 import org.opendaylight.restconf.server.api.DataPutResult;
 import org.opendaylight.restconf.server.api.DataYangPatchResult;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath;
 import org.opendaylight.restconf.server.api.DatabindPath.Action;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java
index e9955a3aee7a1ab618706210c8a782b83d304bf9..833d85bcfad2cf15de29a0f9f71079b749400412 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java
@@ -12,11 +12,11 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.ApiPath.ApiIdentifier;
 import org.opendaylight.restconf.api.ApiPath.ListInstance;
 import org.opendaylight.restconf.api.ApiPath.Step;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java
index d5f507bdb13e7ebeab839adccd8673be387e7a1c..3fcebe89f7f19c14df14bc31631d52bec27b33a7 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java
@@ -17,10 +17,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.ApiPath.ListInstance;
 import org.opendaylight.restconf.api.ApiPath.Step;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath;
 import org.opendaylight.restconf.server.api.DatabindPath.Action;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java
index 4f4b14f2fde2d8b6acbdb291bcbadf89b32f28dc..678f4bef8281cc613fa1b9807cf731f7415d6428 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java
@@ -14,7 +14,7 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import javax.xml.stream.XMLStreamWriter;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Insert.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Insert.java
index 899b60d3af8199dcd9d9477e86eab57de29039a5..78dfa1e7f380cdfc0e20b71705ac12f301ae5f47 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Insert.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Insert.java
@@ -16,11 +16,11 @@ import java.text.ParseException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.QueryParameters;
 import org.opendaylight.restconf.api.query.InsertParam;
 import org.opendaylight.restconf.api.query.PointParam;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java
index d599076eec1a2a64859eea92d8c02a51bf056fea..d1bea5f97f5797a5737537df5cca3b11d6f44b6d 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java
@@ -17,9 +17,9 @@ import java.io.OutputStream;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.FormattableBody;
 import org.opendaylight.restconf.api.query.PrettyPrintParam;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.DatabindPath.OperationPath;
 import org.opendaylight.restconf.server.api.FormattableBodySupport;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java
index b8dfe474ba5dac26f48676bdd0ff79df8ac5bf3e..94728a26b463411afcc1e86f14ab78a8a2f760f1 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java
@@ -13,7 +13,7 @@ import javax.xml.XMLConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java
index 8b602d9dc5d8cadc711fb4b06d4dda058012265c..5ab7cc667a7954e5d6626d2541ca2f0b6897eab8 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java
@@ -10,9 +10,9 @@ package org.opendaylight.restconf.server.spi;
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.FormattableBody;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerException;
 import org.opendaylight.restconf.server.api.ServerRequest;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.YangApi;

diff --git a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathCanonizerTest.java b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathCanonizerTest.java
index 5a62e27b945c1aa14918178582a51a5ca31dfb11..1b951890e42b6174b9b47d7184c126998a2ba464 100644 (file)
--- a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathCanonizerTest.java
+++ b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathCanonizerTest.java
@@ -15,9 +15,9 @@ import com.google.common.collect.ImmutableMap;
 import java.text.ParseException;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.restconf.api.ApiPath;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.ServerError;
 import org.opendaylight.restconf.server.api.ServerException;

diff --git a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathNormalizerTest.java b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathNormalizerTest.java
index 8117e2ae46402c08d1fefa916de8fba53b24ff46..f1009c23b01b3bde17337e2730803571b58a8a30 100644 (file)
--- a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathNormalizerTest.java
+++ b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/ApiPathNormalizerTest.java
@@ -15,9 +15,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import com.google.common.collect.ImmutableMap;
 import java.text.ParseException;
 import org.junit.jupiter.api.Test;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.restconf.api.ApiPath;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.DatabindPath.Action;
 import org.opendaylight.restconf.server.api.DatabindPath.Data;
 import org.opendaylight.restconf.server.api.ServerError;

diff --git a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/InsertTest.java b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/InsertTest.java
index 589087e02763ab51cd00867531c21eab08198207..1abd9dee70243cd031387fcfbd1a7885aa6603bb 100644 (file)
--- a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/InsertTest.java
+++ b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/InsertTest.java
@@ -15,11 +15,11 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.restconf.api.QueryParameters;
 import org.opendaylight.restconf.api.query.ContentParam;
 import org.opendaylight.restconf.api.query.RestconfQueryParam;
 import org.opendaylight.restconf.server.api.DataGetParams;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.EventStreamGetParams;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 

diff --git a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/NC1265Test.java b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/NC1265Test.java
index 17a51324dc9059b44d3a3bb525ec3325af7dba8f..af615e3ebda25849837dc3339519444e729a55e1 100644 (file)
--- a/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/NC1265Test.java
+++ b/protocol/restconf-server-spi/src/test/java/org/opendaylight/restconf/server/spi/NC1265Test.java
@@ -12,9 +12,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.text.ParseException;
 import org.junit.jupiter.api.Test;
+import org.opendaylight.netconf.common.DatabindContext;
 import org.opendaylight.netconf.common.ErrorMessage;
 import org.opendaylight.restconf.api.ApiPath;
-import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.restconf.server.api.ServerError;
 import org.opendaylight.restconf.server.api.ServerErrorInfo;
 import org.opendaylight.restconf.server.api.ServerException;