From a5bf06945fa06ea06bcc68fc9e34625894634a59 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 11 Apr 2024 23:53:26 +0200 Subject: [PATCH] Move ErrorTags ErrorTags now only defines a single ErrorTag. Move it to restconf.nb.rfc8040 for the time being. JIRA: NETCONF-773 Change-Id: I9025682cd563002111dbc2ecf2ba4737810d54fb Signed-off-by: Robert Varga --- .../org/opendaylight/restconf/nb/rfc8040/ErrorTagMapping.java | 1 - .../restconf/nb/rfc8040/{legacy => }/ErrorTags.java | 2 +- .../nb/rfc8040/rests/transactions/RestconfStrategy.java | 2 +- .../opendaylight/restconf/nb/jaxrs/RestconfModulesGetTest.java | 2 +- .../restconf/nb/jaxrs/RestconfSchemaServiceMountTest.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) rename restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/{legacy => }/ErrorTags.java (94%) diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTagMapping.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTagMapping.java index 3e79fe8438..8162698c91 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTagMapping.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTagMapping.java @@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableMap; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.restconf.api.HttpStatusCode; -import org.opendaylight.restconf.nb.rfc8040.legacy.ErrorTags; import org.opendaylight.yangtools.yang.common.ErrorTag; /** diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/ErrorTags.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTags.java similarity index 94% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/ErrorTags.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTags.java index 4c35c3e758..f99826837c 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/ErrorTags.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ErrorTags.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.restconf.nb.rfc8040.legacy; +package org.opendaylight.restconf.nb.rfc8040; import javax.ws.rs.core.Response.Status; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java index 074f466284..993dde4ddf 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java @@ -58,8 +58,8 @@ import org.opendaylight.restconf.common.errors.RestconfError; import org.opendaylight.restconf.common.errors.RestconfFuture; import org.opendaylight.restconf.common.errors.SettableRestconfFuture; import org.opendaylight.restconf.common.patch.PatchContext; +import org.opendaylight.restconf.nb.rfc8040.ErrorTags; import org.opendaylight.restconf.nb.rfc8040.Insert; -import org.opendaylight.restconf.nb.rfc8040.legacy.ErrorTags; import org.opendaylight.restconf.server.api.ChildBody; import org.opendaylight.restconf.server.api.ConfigurationMetadata; import org.opendaylight.restconf.server.api.CreateResourceResult; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfModulesGetTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfModulesGetTest.java index b93a04b082..1ecf3b567b 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfModulesGetTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfModulesGetTest.java @@ -31,7 +31,7 @@ import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService; import org.opendaylight.netconf.dom.api.NetconfDataTreeService; import org.opendaylight.restconf.api.ApiPath; import org.opendaylight.restconf.common.errors.RestconfError; -import org.opendaylight.restconf.nb.rfc8040.legacy.ErrorTags; +import org.opendaylight.restconf.nb.rfc8040.ErrorTags; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.QName; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfSchemaServiceMountTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfSchemaServiceMountTest.java index 47fd119b95..d5b6942531 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfSchemaServiceMountTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/RestconfSchemaServiceMountTest.java @@ -27,7 +27,7 @@ import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService; import org.opendaylight.restconf.api.ApiPath; import org.opendaylight.restconf.api.query.PrettyPrintParam; import org.opendaylight.restconf.nb.rfc8040.ErrorTagMapping; -import org.opendaylight.restconf.nb.rfc8040.legacy.ErrorTags; +import org.opendaylight.restconf.nb.rfc8040.ErrorTags; import org.opendaylight.restconf.server.mdsal.MdsalDatabindProvider; import org.opendaylight.restconf.server.mdsal.MdsalRestconfServer; import org.opendaylight.yangtools.yang.common.ErrorTag; -- 2.36.6