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

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

Renamed openapi package to model because openapi is now a module
name and we are expressing that we are storing here Java classes
that are used to model OpenAPi objects.

JIRA: NETCONF-1011
Change-Id: I1324f1858ee424b354e5f04b758edb19c801b74a
Signed-off-by: OleksandrZharov <Oleksandr.Zharov@pantheon.tech>

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
index 2dd138903b80c52dd5b1cdcead6bd8ae1ab48412..369a79800a559e78432f97b6efa262a18550bba5 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
@@ -41,13 +41,13 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import javax.ws.rs.core.UriInfo;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.sal.rest.doc.openapi.Components;
-import org.opendaylight.netconf.sal.rest.doc.openapi.Info;
-import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
-import org.opendaylight.netconf.sal.rest.doc.openapi.Path;
-import org.opendaylight.netconf.sal.rest.doc.openapi.SecuritySchemes;
-import org.opendaylight.netconf.sal.rest.doc.openapi.Server;
 import org.opendaylight.netconf.sal.rest.doc.util.JsonUtil;
+import org.opendaylight.restconf.openapi.model.Components;
+import org.opendaylight.restconf.openapi.model.Info;
+import org.opendaylight.restconf.openapi.model.OpenApiObject;
+import org.opendaylight.restconf.openapi.model.Path;
+import org.opendaylight.restconf.openapi.model.SecuritySchemes;
+import org.opendaylight.restconf.openapi.model.Server;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiServiceImpl.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiServiceImpl.java
index 4d4c796446340731ec0d9d3936006fa6ad378075..86d69ddec255a2f810010650786bc5a7807df551 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiServiceImpl.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiServiceImpl.java
@@ -19,9 +19,9 @@ 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.openapi.MountPointInstance;
-import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
 import org.opendaylight.restconf.openapi.api.OpenApiService;
+import org.opendaylight.restconf.openapi.model.MountPointInstance;
+import org.opendaylight.restconf.openapi.model.OpenApiObject;
 import org.opendaylight.restconf.openapi.mountpoints.MountPointOpenApi;
 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/restconf/openapi/jaxrs/JaxbContextResolver.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/JaxbContextResolver.java
index 3567af0f9247636eb12bff257d7c50f309f482c6..c77fe46d77572111b932dbd24c810484160d5c0a 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/JaxbContextResolver.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/JaxbContextResolver.java
@@ -13,7 +13,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
-import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
+import org.opendaylight.restconf.openapi.model.OpenApiObject;
 
 @Provider
 @Consumes(MediaType.APPLICATION_JSON)

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Components.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Components.java
similarity index 94%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Components.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Components.java
index 1b61631cf997631288aaafae413cd3d85b8c3b02..65f1736129bddd0059648dcc634221aee09e5c03 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Components.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Components.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Info.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.java
similarity index 92%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Info.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.java
index 5c68c9f740caa112a9aa2154b0480c62f028e9af..82fb18214b5730796cb5794388dff0b01dabb681 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Info.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 public class Info {
     private String version;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/MountPointInstance.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/MountPointInstance.java
similarity index 92%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/MountPointInstance.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/MountPointInstance.java
index ac9e02d4c7adabceb88d0eecc7373d42c697a401..7d40d153bd945ad3980dc87831d84952f1030962 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/MountPointInstance.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/MountPointInstance.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 import java.util.Map;
 

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/OpenApiObject.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OpenApiObject.java
similarity index 96%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/OpenApiObject.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OpenApiObject.java
index dd23124f12023064d7471c0e91f5a8ff86388bbc..83e717e5fb59a551fb72ffb8f4a6318c1e8c5da1 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/OpenApiObject.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OpenApiObject.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import java.util.List;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Path.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Path.java
similarity index 97%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Path.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Path.java
index 4060ddb86ee0da46e563bc2057fa5293718b2d51..1521bb8f0de0879e9d1e4f69fb514e6a1c801344 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Path.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Path.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/SecuritySchemes.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SecuritySchemes.java
similarity index 92%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/SecuritySchemes.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SecuritySchemes.java
index 219738582faa3f3fd07ec10e8912b115561c50b5..9cf4fe5b5efc311cc5c587de3ea0fc5f727882d5 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/SecuritySchemes.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SecuritySchemes.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Server.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Server.java
similarity index 91%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Server.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Server.java
index cfc79471feaca09125d4e7aa39a2e02dfd34f2fb..7a78244ee13c0eecf36a7a6df9a006e755d9677a 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/openapi/Server.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Server.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.openapi;
+package org.opendaylight.restconf.openapi.model;
 
 public class Server {
     private String url;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java
index ae06274d658fa9c5350e9cea9cac9aa356c1bb46..ae02b9cda7ef2cbbc66704311f872371fa5c47a2 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java
@@ -33,10 +33,10 @@ import javax.ws.rs.core.UriInfo;
 import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
-import org.opendaylight.netconf.sal.rest.doc.openapi.Path;
 import org.opendaylight.restconf.openapi.impl.BaseYangOpenApiGenerator;
 import org.opendaylight.restconf.openapi.impl.DefinitionNames;
+import org.opendaylight.restconf.openapi.model.OpenApiObject;
+import org.opendaylight.restconf.openapi.model.Path;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.java
index 1a992c4e8d51d5b1e209ffc67c10983d0e94b23a..926ab9cff977b57a0d6c8d1474ff9be00079a5a2 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.java
@@ -18,9 +18,9 @@ import java.util.List;
 import java.util.Set;
 import org.junit.Test;
 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.restconf.openapi.model.OpenApiObject;
+import org.opendaylight.restconf.openapi.model.Path;
 import org.opendaylight.yangtools.yang.common.Revision;
 
 public final class OpenApiGeneratorRFC8040Test extends AbstractOpenApiTest {

diff --git a/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApiTest.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApiTest.java
index ab1d958521453c20806bf4783093d8fd54b8bfe2..35f9239a8311c4c4b3c4e94705d327c7fa9bb43d 100644 (file)
--- a/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApiTest.java
+++ b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApiTest.java
@@ -26,10 +26,10 @@ 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.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.restconf.openapi.impl.MountPointOpenApiGeneratorRFC8040;
+import org.opendaylight.restconf.openapi.model.OpenApiObject;
+import org.opendaylight.restconf.openapi.model.Path;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;