Refactor org.opendaylight.netconf.sal.rest.doc.api

Renamed package org.opendaylight.netconf.sal.rest.doc.api to
org.opendaylight.restconf.openapi.api.

JIRA: NETCONF-1011
Change-Id: I681caea35a57e02f445713adf27084fb0c142305
Signed-off-by: OleksandrZharov <Oleksandr.Zharov@pantheon.tech>
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImpl.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImpl.java
index 67af263cc0df84681c3e122248a3e403a0881d35..de3afd234e2dd88e5721115c92f3a02e346def5a 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImpl.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImpl.java
@@ -19,10 +19,10 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.sal.rest.doc.api.OpenApiService;
 import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointOpenApi;
 import org.opendaylight.netconf.sal.rest.doc.openapi.MountPointInstance;
 import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
+import org.opendaylight.restconf.openapi.api.OpenApiService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/OpenApiApplication.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/OpenApiApplication.java
index 80cf051b89d458326173647d877b5c1b0123be86..8086dc18fba1709b607b556f61c362e0ec4aa168 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/OpenApiApplication.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/OpenApiApplication.java
@@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import java.util.Set;
 import javax.ws.rs.core.Application;
-import org.opendaylight.netconf.sal.rest.doc.api.OpenApiService;
+import org.opendaylight.restconf.openapi.api.OpenApiService;
 
 // FIXME: hide this class
 public final class OpenApiApplication extends Application {

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/WebInitializer.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/WebInitializer.java
index e2680dce7b8e156e1a5c345f52f44c308e9e2e35..f514a1e83009c4185e819e0178d259969a1f8802 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/WebInitializer.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/WebInitializer.java
@@ -17,7 +17,7 @@ import org.opendaylight.aaa.web.WebContext;
 import org.opendaylight.aaa.web.WebContextSecurer;
 import org.opendaylight.aaa.web.WebServer;
 import org.opendaylight.aaa.web.servlet.ServletSupport;
-import org.opendaylight.netconf.sal.rest.doc.api.OpenApiService;
+import org.opendaylight.restconf.openapi.api.OpenApiService;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/api/OpenApiService.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/api/OpenApiService.java
similarity index 98%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/api/OpenApiService.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/api/OpenApiService.java
index adeaf6544c91344e3410b8465767d41208fc4bf9..7219cd72dee1f8ff897018ce722357ac5eb803d6 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/api/OpenApiService.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/api/OpenApiService.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.sal.rest.doc.api;
+package org.opendaylight.restconf.openapi.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGeneratorTest.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGeneratorTest.java
index 736b19691acf124f247c91e188491776ba1f15b8..2fc9e20a9a9c6322161412670d42728361cb8cac 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGeneratorTest.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGeneratorTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.IOException;
 import org.junit.Test;
-import org.opendaylight.netconf.sal.rest.doc.AbstractOpenApiTest;
+import org.opendaylight.restconf.openapi.api.AbstractOpenApiTest;
 import org.opendaylight.yangtools.yang.common.Revision;
 
 public final class DefinitionGeneratorTest extends AbstractOpenApiTest {

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040Test.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040Test.java
index 8209b0e0734e1f764c3b8de5f394e6bb211182b4..e70d52b544841629b127759bf543ced89e2f85d6 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040Test.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040Test.java
@@ -17,10 +17,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.List;
 import java.util.Set;
 import org.junit.Test;
-import org.opendaylight.netconf.sal.rest.doc.AbstractOpenApiTest;
 import org.opendaylight.netconf.sal.rest.doc.DocGenTestHelper;
 import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
 import org.opendaylight.netconf.sal.rest.doc.openapi.Path;
+import org.opendaylight.restconf.openapi.api.AbstractOpenApiTest;
 import org.opendaylight.yangtools.yang.common.Revision;
 
 public final class OpenApiGeneratorRFC8040Test extends AbstractOpenApiTest {

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImplTest.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImplTest.java
index 5ed39acb8efcffd15afe1cc5cd75a8f00f1da7fd..3f2e312eaf3cf3319289492e86f3e3d6b99be3dc 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImplTest.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImplTest.java
@@ -19,9 +19,9 @@ import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.sal.rest.doc.AbstractOpenApiTest;
 import org.opendaylight.netconf.sal.rest.doc.DocGenTestHelper;
-import org.opendaylight.netconf.sal.rest.doc.api.OpenApiService;
+import org.opendaylight.restconf.openapi.api.AbstractOpenApiTest;
+import org.opendaylight.restconf.openapi.api.OpenApiService;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApiTest.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApiTest.java
index 92dbdec86adacce189c9dd11656860e36052fb3a..d305553b24cb408ff07df4146ae8fef6b3438b96 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApiTest.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApiTest.java
@@ -25,11 +25,11 @@ import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.sal.rest.doc.AbstractOpenApiTest;
 import org.opendaylight.netconf.sal.rest.doc.DocGenTestHelper;
 import org.opendaylight.netconf.sal.rest.doc.impl.MountPointOpenApiGeneratorRFC8040;
 import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
 import org.opendaylight.netconf.sal.rest.doc.openapi.Path;
+import org.opendaylight.restconf.openapi.api.AbstractOpenApiTest;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/api/AbstractOpenApiTest.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/api/AbstractOpenApiTest.java
similarity index 95%
rename from restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/api/AbstractOpenApiTest.java
rename to restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/api/AbstractOpenApiTest.java
index f522e70b0f5299bc91bc80d38dffc5514d9c200f..b44c35ca9da9eab5dc7db70cbfcd3097498f99e1 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/api/AbstractOpenApiTest.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/api/AbstractOpenApiTest.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.sal.rest.doc;
+package org.opendaylight.restconf.openapi.api;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;