From: OleksandrZharov Date: Tue, 9 May 2023 13:34:35 +0000 (+0200) Subject: Refactor org.opendaylight.netconf.sal.rest.doc.util X-Git-Tag: v6.0.0~98 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1ec71b0ce4ca998fe9244ea54bebae754473b7cd;p=netconf.git 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 Signed-off-by: Ivan Hrasko --- 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 369a79800a..6ed2e33863 100644 --- 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 d7270b83ff..59ea5f7ad1 100644 --- 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 df753775eb..9eff620184 100644 --- 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 8105fb2352..323c22de25 100644 --- 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;