Move RestconfSchemaSourceUrlProvider

This component is part of dealing with yang-library content, similar to
what we are doing for ietf-restconf, as both really should be transient
state.

Move it to restconf.server.mdsal, so it is co-located with other
datastore state-keeping components.

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

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProvider.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/RestconfSchemaSourceUrlProvider.java
similarity index 97%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProvider.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/RestconfSchemaSourceUrlProvider.java
index eaf944ca5e6a61e5269221efbb6605d519d66e20..be29bdf7fef89486d20a6ae3328d3a59e1271270 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProvider.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/RestconfSchemaSourceUrlProvider.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.nb.rfc8040.rests.services.impl;
+package org.opendaylight.restconf.server.mdsal;
 
 import java.util.Optional;
 import javax.inject.Inject;

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/mdsal/RestconfSchemaSourceUrlProviderTest.java
similarity index 91%
rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/mdsal/RestconfSchemaSourceUrlProviderTest.java
index 4d022c335fa2c0b8a7692837b00bb4096b616119..acc4303b80ca36e367053b052e42ace8231394e1 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/mdsal/RestconfSchemaSourceUrlProviderTest.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.nb.rfc8040.rests.services.impl;
+package org.opendaylight.restconf.server.mdsal;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -30,14 +30,14 @@ class RestconfSchemaSourceUrlProviderTest {
     }
 
     @ParameterizedTest(name = "Supported module-set name. URL: {2}")
-    @MethodSource("getSchemaSourceUrlArgs")
+    @MethodSource
     void getSchemaSourceUrl(final String moduleName, final Revision revision, final Uri expected) {
         final var urlProvider = new RestconfSchemaSourceUrlProvider();
         final var result = urlProvider.getSchemaSourceUrl("ODL_modules", moduleName, revision);
         assertEquals(Optional.of(expected), result);
     }
 
-    private static List<Arguments> getSchemaSourceUrlArgs() {
+    private static List<Arguments> getSchemaSourceUrl() {
         return List.of(
             Arguments.of("odl-module", Revision.of("2023-02-23"),
                 new Uri("/rests/modules/odl-module?revision=2023-02-23")),