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

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

JIRA: NETCONF-1011
Change-Id: Ia75829170a18bb0eda0e42bc28779dd96fb7eb17
Signed-off-by: OleksandrZharov <[email protected]>
Signed-off-by: Ivan Hrasko <[email protected]>

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 369a79800a559e78432f97b6efa262a18550bba5..6ed2e33863f4efef0a5196e94b8e874bbd7ff580 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
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.restconf.openapi.impl;
 
-import static org.opendaylight.netconf.sal.rest.doc.util.JsonUtil.addFields;
-import static org.opendaylight.netconf.sal.rest.doc.util.RestDocgenUtil.resolvePathArgumentsName;
 import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.TOP;
 import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.buildDelete;
 import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.buildGet;
@@ -17,6 +15,8 @@ import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.b
 import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.buildPostOperation;
 import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.buildPut;
 import static org.opendaylight.restconf.openapi.model.builder.OperationBuilder.getTypeParentNode;
+import static org.opendaylight.restconf.openapi.util.JsonUtil.addFields;
+import static org.opendaylight.restconf.openapi.util.RestDocgenUtil.resolvePathArgumentsName;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -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.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.restconf.openapi.util.JsonUtil;
 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/model/builder/OperationBuilder.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/builder/OperationBuilder.java
index d7270b83ff48033242b1a3fb1554d2799efc0e0c..59ea5f7ad142eab6af19a128c71767bff1c0a91a 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/builder/OperationBuilder.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/builder/OperationBuilder.java
@@ -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.util.JsonUtil;
 import org.opendaylight.restconf.openapi.impl.DefinitionNames;
+import org.opendaylight.restconf.openapi.util.JsonUtil;
 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/util/JsonUtil.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/util/JsonUtil.java
similarity index 95%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/JsonUtil.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/util/JsonUtil.java
index df753775eba39605e3be0fbd5899f9b72b90b4e0..9eff6201842586aa9484b71982550e22824059b6 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/JsonUtil.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/util/JsonUtil.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.netconf.sal.rest.doc.util;
+package org.opendaylight.restconf.openapi.util;
 
 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/util/RestDocgenUtil.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/util/RestDocgenUtil.java
similarity index 98%
rename from restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/RestDocgenUtil.java
rename to restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/util/RestDocgenUtil.java
index 8105fb2352a7e7206c9cec8fb3d8c488284e872a..323c22de254d3b28f737ecebe72bae762ff55925 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/RestDocgenUtil.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/util/RestDocgenUtil.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.util;
+package org.opendaylight.restconf.openapi.util;
 
 import java.util.HashMap;
 import java.util.Map;