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

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

JIRA: NETCONF-1011
Change-Id: I0f0fef987a5150903e1cee3f508960e89f7ef120
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/model/builder/OperationBuilder.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java
index 42e1b647e257dbbeb6e463097b3bcda3f76ef2cc..06f7ec8399278dcca050f17540cc76a0895e196d 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java
@@ -8,9 +8,9 @@
 
 package org.opendaylight.netconf.sal.rest.doc.model.builder;
 
-import static org.opendaylight.netconf.sal.rest.doc.impl.DefinitionGenerator.INPUT;
-import static org.opendaylight.netconf.sal.rest.doc.impl.DefinitionGenerator.INPUT_SUFFIX;
-import static org.opendaylight.netconf.sal.rest.doc.impl.DefinitionGenerator.OUTPUT_SUFFIX;
+import static org.opendaylight.restconf.openapi.impl.DefinitionGenerator.INPUT;
+import static org.opendaylight.restconf.openapi.impl.DefinitionGenerator.INPUT_SUFFIX;
+import static org.opendaylight.restconf.openapi.impl.DefinitionGenerator.OUTPUT_SUFFIX;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -21,8 +21,8 @@ import java.util.Optional;
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import org.opendaylight.netconf.sal.rest.doc.impl.DefinitionNames;
 import org.opendaylight.netconf.sal.rest.doc.util.JsonUtil;
+import org.opendaylight.restconf.openapi.impl.DefinitionNames;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.InputSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.OperationDefinition;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApi.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApi.java
index da2569108fe9c1d3bc3c8d863435bfe185640c9d..80f99384efbb8fe40c9bd98134a2e58c1041361d 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApi.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointOpenApi.java
@@ -9,14 +9,14 @@ package org.opendaylight.netconf.sal.rest.doc.mountpoints;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
-import static org.opendaylight.netconf.sal.rest.doc.impl.BaseYangOpenApiGenerator.BASE_PATH;
-import static org.opendaylight.netconf.sal.rest.doc.impl.OpenApiServiceImpl.DEFAULT_PAGESIZE;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.DESCRIPTION_KEY;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.RESPONSES_KEY;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.SUMMARY_KEY;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.SUMMARY_SEPARATOR;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.TAGS_KEY;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.buildTagsValue;
+import static org.opendaylight.restconf.openapi.impl.BaseYangOpenApiGenerator.BASE_PATH;
+import static org.opendaylight.restconf.openapi.impl.OpenApiServiceImpl.DEFAULT_PAGESIZE;
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -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.impl.BaseYangOpenApiGenerator;
-import org.opendaylight.netconf.sal.rest.doc.impl.DefinitionNames;
 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.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/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
similarity index 99%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
index 657b78875c2b3bc833ed06c84fac07b48c59c6b1..01b9e75d25a612046b2d51fe180d5a8a98139fac 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.TOP;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.buildDelete;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGeneratorRFC8040.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.java
similarity index 97%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGeneratorRFC8040.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.java
index c644a072215ecaaab547b452190bbfc6ab907321..d0f90d5d08e3402b0cba1575575f491e2a6db0e7 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGeneratorRFC8040.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java
similarity index 99%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java
index cda0ca3f708edffb339ca84c4bda6d2f15a62b14..4c110da5986220d2ac4f73fa8c8a0ca7da46c011 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java
@@ -5,9 +5,8 @@
  * 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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
-import static org.opendaylight.netconf.sal.rest.doc.impl.BaseYangOpenApiGenerator.MODULE_NAME_SUFFIX;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.COMPONENTS_PREFIX;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.CONFIG;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.NAME_KEY;
@@ -15,6 +14,7 @@ import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuild
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.TOP;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.XML_KEY;
 import static org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.XML_SUFFIX;
+import static org.opendaylight.restconf.openapi.impl.BaseYangOpenApiGenerator.MODULE_NAME_SUFFIX;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionNames.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionNames.java
similarity index 97%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionNames.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionNames.java
index 4eb97eba181f100e2387543209807b2d11535f3d..d51ee88fa7d8c41edec27606b6a6896c479b0064 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionNames.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionNames.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointOpenApiGeneratorRFC8040.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/MountPointOpenApiGeneratorRFC8040.java
similarity index 96%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointOpenApiGeneratorRFC8040.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/MountPointOpenApiGeneratorRFC8040.java
index 6438092481cbca072be8e6b25bd4a4723920f5c3..29fb2696ba532cb9202906924f512a926b058e26 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointOpenApiGeneratorRFC8040.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/MountPointOpenApiGeneratorRFC8040.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import java.util.Optional;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040.java
similarity index 94%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040.java
index aa7d658b3e6f7cc6f3fb4d998c8f43806658055c..d6acb6bcb5f46d380a4caf5fa47b475714d58766 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import java.util.Optional;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;

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/restconf/openapi/impl/OpenApiServiceImpl.java
similarity index 99%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImpl.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/OpenApiServiceImpl.java
index de3afd234e2dd88e5721115c92f3a02e346def5a..bc560e3397594224a6e3c50802b22eb69fbf656c 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/restconf/openapi/impl/OpenApiServiceImpl.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import static java.util.Objects.requireNonNull;
 

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 d305553b24cb408ff07df4146ae8fef6b3438b96..07896ef61c37bbbe686d4b4d0a0e70b9f8b786fe 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
@@ -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.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.restconf.openapi.impl.MountPointOpenApiGeneratorRFC8040;
 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/impl/DefinitionGeneratorTest.java b/restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/DefinitionGeneratorTest.java
similarity index 97%
rename from restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGeneratorTest.java
rename to restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/DefinitionGeneratorTest.java
index 2fc9e20a9a9c6322161412670d42728361cb8cac..2cc5b79a7bbd2c0aff09cc247bc392cb6d6f894f 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/restconf/openapi/impl/DefinitionGeneratorTest.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import static org.junit.Assert.assertNotNull;
 

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/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.java
similarity index 99%
rename from restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiGeneratorRFC8040Test.java
rename to restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.java
index e70d52b544841629b127759bf543ced89e2f85d6..1a992c4e8d51d5b1e209ffc67c10983d0e94b23a 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/restconf/openapi/impl/OpenApiGeneratorRFC8040Test.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

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/restconf/openapi/impl/OpenApiServiceImplTest.java
similarity index 98%
rename from restconf/restconf-openapi/src/test/java/org/opendaylight/netconf/sal/rest/doc/impl/OpenApiServiceImplTest.java
rename to restconf/restconf-openapi/src/test/java/org/opendaylight/restconf/openapi/impl/OpenApiServiceImplTest.java
index 3f2e312eaf3cf3319289492e86f3e3d6b99be3dc..8918b0865b6d1168dd52ffdc4a43307e6a193883 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/restconf/openapi/impl/OpenApiServiceImplTest.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.impl;
+package org.opendaylight.restconf.openapi.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;