Move OperationsContent

This is a purely server-side implementation thing, move it to its sole
user.

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

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/OperationsContent.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.java
similarity index 97%
rename from restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/OperationsContent.java
rename to restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.java
index 199728f22346385353a6af10caa158e93950cd7b..3dee0dc19980db30e0bdedb3ab0e39f92cc04d0e 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/OperationsContent.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.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.common;
+package org.opendaylight.restconf.nb.rfc8040.rests.services.impl;
 
 import static java.util.Objects.requireNonNull;
 
@@ -28,8 +28,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.RpcEffectiveStatement;
  * RESTCONF {@code /operations} content for a {@code GET} operation as per
  * <a href="https://datatracker.ietf.org/doc/html/rfc8040#section-3.3.2">RFC8040</a>.
  */
-// FIXME: when bierman02 is gone, this should be folded to nb-rfc8040, as it is a server-side thing.
-public enum OperationsContent {
+enum OperationsContent {
     JSON("{ \"ietf-restconf:operations\" : { } }") {
         @Override
         String createBody(final List<Entry<String, List<String>>> rpcsByPrefix) {

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java
index dfa708274b17faa6431ad0a6bb9c889fb49b6130..8cfa859799cdd6ee6b26d6e2e4ef3cfad391254c 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java
@@ -15,7 +15,6 @@ import javax.ws.rs.core.UriInfo;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.restconf.common.OperationsContent;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
 import org.opendaylight.restconf.common.util.OperationsResourceUtils;

diff --git a/restconf/restconf-common/src/test/java/org/opendaylight/restconf/common/Netconf822Test.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.java
similarity index 95%
rename from restconf/restconf-common/src/test/java/org/opendaylight/restconf/common/Netconf822Test.java
rename to restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.java
index 70f56bfeacba494c0a03f6cd223a2c4919ef6dc7..9c66d59350fdada043d93f357b84ec22e8829f6d 100644 (file)
--- a/restconf/restconf-common/src/test/java/org/opendaylight/restconf/common/Netconf822Test.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.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.common;
+package org.opendaylight.restconf.nb.rfc8040.rests.services.impl;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/restconf/restconf-common/src/test/resources/nc822/foo@2021-09-29.yang b/restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-29.yang
similarity index 100%
rename from restconf/restconf-common/src/test/resources/nc822/foo@2021-09-29.yang
rename to restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-29.yang

diff --git a/restconf/restconf-common/src/test/resources/nc822/foo@2021-09-30.yang b/restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-30.yang
similarity index 100%
rename from restconf/restconf-common/src/test/resources/nc822/foo@2021-09-30.yang
rename to restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-30.yang