From: Robert Varga Date: Mon, 12 Feb 2024 12:26:41 +0000 (+0100) Subject: Move AbstractBody et al. X-Git-Tag: v7.0.0~42 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=410ef741d3da1d97a72d096239b8bb3753429e9f;p=netconf.git Move AbstractBody et al. Request bodies are part of RESTCONF server API, move them into that package. JIRA: NETCONF-773 Change-Id: I1fe9e41d237eaf5ffd70a31f9b4eebd1d6e43bed Signed-off-by: Robert Varga --- diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsRestconf.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsRestconf.java index 1c8fe573d3..4a59c104e7 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsRestconf.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsRestconf.java @@ -51,17 +51,6 @@ import org.opendaylight.restconf.common.errors.RestconfError; import org.opendaylight.restconf.common.errors.RestconfFuture; import org.opendaylight.restconf.common.patch.PatchStatusContext; import org.opendaylight.restconf.nb.rfc8040.URLConstants; -import org.opendaylight.restconf.nb.rfc8040.databind.JsonChildBody; -import org.opendaylight.restconf.nb.rfc8040.databind.JsonDataPostBody; -import org.opendaylight.restconf.nb.rfc8040.databind.JsonOperationInputBody; -import org.opendaylight.restconf.nb.rfc8040.databind.JsonPatchBody; -import org.opendaylight.restconf.nb.rfc8040.databind.JsonResourceBody; -import org.opendaylight.restconf.nb.rfc8040.databind.OperationInputBody; -import org.opendaylight.restconf.nb.rfc8040.databind.XmlChildBody; -import org.opendaylight.restconf.nb.rfc8040.databind.XmlDataPostBody; -import org.opendaylight.restconf.nb.rfc8040.databind.XmlOperationInputBody; -import org.opendaylight.restconf.nb.rfc8040.databind.XmlPatchBody; -import org.opendaylight.restconf.nb.rfc8040.databind.XmlResourceBody; import org.opendaylight.restconf.nb.rfc8040.databind.jaxrs.QueryParams; import org.opendaylight.restconf.nb.rfc8040.legacy.ErrorTags; import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload; @@ -73,10 +62,21 @@ import org.opendaylight.restconf.server.api.DataPostResult.CreateResource; import org.opendaylight.restconf.server.api.DataPostResult.InvokeOperation; import org.opendaylight.restconf.server.api.DataPutResult; import org.opendaylight.restconf.server.api.DataYangPatchResult; +import org.opendaylight.restconf.server.api.JsonChildBody; +import org.opendaylight.restconf.server.api.JsonDataPostBody; +import org.opendaylight.restconf.server.api.JsonOperationInputBody; +import org.opendaylight.restconf.server.api.JsonPatchBody; +import org.opendaylight.restconf.server.api.JsonResourceBody; import org.opendaylight.restconf.server.api.ModulesGetResult; +import org.opendaylight.restconf.server.api.OperationInputBody; import org.opendaylight.restconf.server.api.OperationsGetResult; import org.opendaylight.restconf.server.api.OperationsPostResult; import org.opendaylight.restconf.server.api.RestconfServer; +import org.opendaylight.restconf.server.api.XmlChildBody; +import org.opendaylight.restconf.server.api.XmlDataPostBody; +import org.opendaylight.restconf.server.api.XmlOperationInputBody; +import org.opendaylight.restconf.server.api.XmlPatchBody; +import org.opendaylight.restconf.server.api.XmlResourceBody; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.YangConstants; import org.slf4j.Logger; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/package-info.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/package-info.java deleted file mode 100644 index b21c3f7ee6..0000000000 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 PANTHEON.tech, s.r.o. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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 holding concepts related to data binding. - */ -package org.opendaylight.restconf.nb.rfc8040.databind; \ No newline at end of file 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 4a2eb8e76d..e253886bb2 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 @@ -65,20 +65,17 @@ import org.opendaylight.restconf.common.patch.PatchContext; import org.opendaylight.restconf.common.patch.PatchStatusContext; import org.opendaylight.restconf.common.patch.PatchStatusEntity; import org.opendaylight.restconf.nb.rfc8040.Insert; -import org.opendaylight.restconf.nb.rfc8040.databind.ChildBody; -import org.opendaylight.restconf.nb.rfc8040.databind.DataPostBody; -import org.opendaylight.restconf.nb.rfc8040.databind.OperationInputBody; -import org.opendaylight.restconf.nb.rfc8040.databind.PatchBody; -import org.opendaylight.restconf.nb.rfc8040.databind.ResourceBody; import org.opendaylight.restconf.nb.rfc8040.legacy.ErrorTags; import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload; import org.opendaylight.restconf.nb.rfc8040.legacy.QueryParameters; import org.opendaylight.restconf.nb.rfc8040.utils.parser.YangInstanceIdentifierSerializer; +import org.opendaylight.restconf.server.api.ChildBody; import org.opendaylight.restconf.server.api.ConfigurationMetadata; import org.opendaylight.restconf.server.api.DataGetParams; import org.opendaylight.restconf.server.api.DataGetResult; import org.opendaylight.restconf.server.api.DataPatchPath; import org.opendaylight.restconf.server.api.DataPatchResult; +import org.opendaylight.restconf.server.api.DataPostBody; import org.opendaylight.restconf.server.api.DataPostPath; import org.opendaylight.restconf.server.api.DataPostResult; import org.opendaylight.restconf.server.api.DataPostResult.CreateResource; @@ -87,9 +84,12 @@ import org.opendaylight.restconf.server.api.DataPutPath; import org.opendaylight.restconf.server.api.DataPutResult; import org.opendaylight.restconf.server.api.DataYangPatchResult; import org.opendaylight.restconf.server.api.DatabindContext; +import org.opendaylight.restconf.server.api.OperationInputBody; import org.opendaylight.restconf.server.api.OperationsGetResult; import org.opendaylight.restconf.server.api.OperationsPostPath; import org.opendaylight.restconf.server.api.OperationsPostResult; +import org.opendaylight.restconf.server.api.PatchBody; +import org.opendaylight.restconf.server.api.ResourceBody; import org.opendaylight.restconf.server.spi.ApiPathNormalizer; import org.opendaylight.restconf.server.spi.ApiPathNormalizer.DataPath; import org.opendaylight.restconf.server.spi.ApiPathNormalizer.InstanceReference; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/AbstractBody.java similarity index 98% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/AbstractBody.java index 8731c1c774..9922ec3aea 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/AbstractBody.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.databind; +package org.opendaylight.restconf.server.api; import static java.util.Objects.requireNonNull; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/ChildBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ChildBody.java similarity index 92% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/ChildBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ChildBody.java index 61f64c2904..dbc5f5c8ba 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/ChildBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ChildBody.java @@ -5,14 +5,13 @@ * 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.databind; +package org.opendaylight.restconf.server.api; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; import java.io.InputStream; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.restconf.server.api.DataPostPath; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPatchPath.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPatchPath.java index 391f63689f..03cc83977b 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPatchPath.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPatchPath.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.restconf.api.ApiPath; -import org.opendaylight.restconf.nb.rfc8040.databind.PatchBody; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/DataPostBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostBody.java similarity index 88% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/DataPostBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostBody.java index 84800d6588..3285dd3deb 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/DataPostBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostBody.java @@ -5,11 +5,10 @@ * 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.databind; +package org.opendaylight.restconf.server.api; import java.io.InputStream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.restconf.server.api.DataPostPath; /** * Body of a {@code POST} request as defined in diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostPath.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostPath.java index acba90f79b..49c6fa0f2f 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostPath.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPostPath.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.restconf.api.ApiPath; -import org.opendaylight.restconf.nb.rfc8040.databind.DataPostBody; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPutPath.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPutPath.java index 3b346f0a71..584dc9e2db 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPutPath.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataPutPath.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.restconf.api.ApiPath; -import org.opendaylight.restconf.nb.rfc8040.databind.DataPostBody; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonChildBody.java similarity index 97% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonChildBody.java index 22d184467a..75192adaa3 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonChildBody.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.databind; +package org.opendaylight.restconf.server.api; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -15,7 +15,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.DataPostPath; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonDataPostBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonDataPostBody.java similarity index 93% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonDataPostBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonDataPostBody.java index bb7517326d..6ed49bca40 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonDataPostBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonDataPostBody.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.databind; +package org.opendaylight.restconf.server.api; import java.io.InputStream; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonOperationInputBody.java similarity index 93% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonOperationInputBody.java index ad92b55356..8f88d85e5b 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonOperationInputBody.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.databind; +package org.opendaylight.restconf.server.api; import com.google.gson.JsonParseException; import com.google.gson.stream.JsonReader; @@ -14,7 +14,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.OperationsPostPath; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonPatchBody.java similarity index 98% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonPatchBody.java index ed1c7f8774..951b9c020d 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonPatchBody.java @@ -6,7 +6,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.databind; +package org.opendaylight.restconf.server.api; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; @@ -26,8 +26,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.common.patch.PatchContext; import org.opendaylight.restconf.common.patch.PatchEntity; -import org.opendaylight.restconf.server.api.DataPatchPath; -import org.opendaylight.restconf.server.api.DatabindContext; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.patch.rev170222.yang.patch.yang.patch.Edit.Operation; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonResourceBody.java similarity index 96% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonResourceBody.java index de30d31ac9..48a5bf456c 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/JsonResourceBody.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.databind; +package org.opendaylight.restconf.server.api; import com.google.gson.JsonIOException; import com.google.gson.JsonParseException; @@ -16,7 +16,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.DataPutPath; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/OperationInputBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/OperationInputBody.java similarity index 95% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/OperationInputBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/OperationInputBody.java index 55c76f257c..45b858408f 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/OperationInputBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/OperationInputBody.java @@ -5,13 +5,12 @@ * 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.databind; +package org.opendaylight.restconf.server.api; import java.io.IOException; import java.io.InputStream; import java.io.PushbackInputStream; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.restconf.server.api.OperationsPostPath; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/PatchBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/PatchBody.java similarity index 96% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/PatchBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/PatchBody.java index 24ea9f2409..3660239b0b 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/PatchBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/PatchBody.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.databind; +package org.opendaylight.restconf.server.api; import static com.google.common.base.Verify.verify; @@ -17,7 +17,6 @@ import org.opendaylight.restconf.api.ApiPath; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.common.patch.PatchContext; import org.opendaylight.restconf.nb.rfc8040.utils.parser.YangInstanceIdentifierSerializer; -import org.opendaylight.restconf.server.api.DataPatchPath; import org.opendaylight.restconf.server.spi.ApiPathNormalizer; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.patch.rev170222.yang.patch.yang.patch.Edit.Operation; import org.opendaylight.yangtools.yang.common.ErrorTag; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/ResourceBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ResourceBody.java similarity index 97% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/ResourceBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ResourceBody.java index e20520369a..ac4bda4c48 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/ResourceBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ResourceBody.java @@ -5,13 +5,12 @@ * 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.databind; +package org.opendaylight.restconf.server.api; import java.io.IOException; import java.io.InputStream; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.DataPutPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.restconf.restconf.Data; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/RestconfServer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/RestconfServer.java index 756cdaba17..f1ee961264 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/RestconfServer.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/RestconfServer.java @@ -13,11 +13,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.restconf.api.ApiPath; import org.opendaylight.restconf.common.errors.RestconfFuture; -import org.opendaylight.restconf.nb.rfc8040.databind.ChildBody; -import org.opendaylight.restconf.nb.rfc8040.databind.DataPostBody; -import org.opendaylight.restconf.nb.rfc8040.databind.OperationInputBody; -import org.opendaylight.restconf.nb.rfc8040.databind.PatchBody; -import org.opendaylight.restconf.nb.rfc8040.databind.ResourceBody; import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload; import org.opendaylight.yangtools.yang.common.Empty; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlChildBody.java similarity index 98% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlChildBody.java index 00455db3cd..e174a4c4a2 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlChildBody.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.databind; +package org.opendaylight.restconf.server.api; import static com.google.common.base.Preconditions.checkState; @@ -17,7 +17,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.DataPostPath; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlDataPostBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlDataPostBody.java similarity index 93% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlDataPostBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlDataPostBody.java index 61d92d91a1..2f31056606 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlDataPostBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlDataPostBody.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.databind; +package org.opendaylight.restconf.server.api; import java.io.InputStream; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlOperationInputBody.java similarity index 93% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlOperationInputBody.java index af8652537b..cc84311980 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlOperationInputBody.java @@ -5,13 +5,12 @@ * 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.databind; +package org.opendaylight.restconf.server.api; import java.io.IOException; import java.io.InputStream; import javax.xml.stream.XMLStreamException; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.OperationsPostPath; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlPatchBody.java similarity index 98% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlPatchBody.java index 4dab95f0d0..ff088c358f 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlPatchBody.java @@ -6,7 +6,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.databind; +package org.opendaylight.restconf.server.api; import com.google.common.collect.ImmutableList; import java.io.IOException; @@ -20,7 +20,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.common.patch.PatchContext; import org.opendaylight.restconf.common.patch.PatchEntity; -import org.opendaylight.restconf.server.api.DataPatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.patch.rev170222.yang.patch.yang.patch.Edit.Operation; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.ErrorTag; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlResourceBody.java similarity index 96% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBody.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlResourceBody.java index b5764dd451..c49075beb3 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/XmlResourceBody.java @@ -5,14 +5,13 @@ * 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.databind; +package org.opendaylight.restconf.server.api; import java.io.IOException; import java.io.InputStream; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.server.api.DataPutPath; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java index e77f733d9b..2621ac83d6 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java @@ -34,26 +34,26 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService.YangTextSourceExtension; import org.opendaylight.restconf.api.ApiPath; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.common.errors.RestconfFuture; -import org.opendaylight.restconf.nb.rfc8040.databind.ChildBody; -import org.opendaylight.restconf.nb.rfc8040.databind.DataPostBody; -import org.opendaylight.restconf.nb.rfc8040.databind.OperationInputBody; -import org.opendaylight.restconf.nb.rfc8040.databind.PatchBody; -import org.opendaylight.restconf.nb.rfc8040.databind.ResourceBody; import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.MdsalRestconfStrategy; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.RestconfStrategy; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.RestconfStrategy.StrategyAndTail; +import org.opendaylight.restconf.server.api.ChildBody; import org.opendaylight.restconf.server.api.DataGetParams; import org.opendaylight.restconf.server.api.DataGetResult; import org.opendaylight.restconf.server.api.DataPatchResult; +import org.opendaylight.restconf.server.api.DataPostBody; import org.opendaylight.restconf.server.api.DataPostResult; import org.opendaylight.restconf.server.api.DataPostResult.CreateResource; import org.opendaylight.restconf.server.api.DataPutResult; import org.opendaylight.restconf.server.api.DataYangPatchResult; import org.opendaylight.restconf.server.api.DatabindContext; import org.opendaylight.restconf.server.api.ModulesGetResult; +import org.opendaylight.restconf.server.api.OperationInputBody; import org.opendaylight.restconf.server.api.OperationsGetResult; import org.opendaylight.restconf.server.api.OperationsPostResult; +import org.opendaylight.restconf.server.api.PatchBody; +import org.opendaylight.restconf.server.api.ResourceBody; import org.opendaylight.restconf.server.api.RestconfServer; import org.opendaylight.restconf.server.spi.DatabindProvider; import org.opendaylight.restconf.server.spi.RpcImplementation; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java index be4c565546..286b66c0fa 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractOperationInputBodyTest.java @@ -13,6 +13,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.restconf.nb.rfc8040.AbstractInstanceIdentifierTest; import org.opendaylight.restconf.server.api.DatabindContext; +import org.opendaylight.restconf.server.api.OperationInputBody; import org.opendaylight.restconf.server.api.OperationsPostPath; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java index 80e9b03dc1..81673d2d8c 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractPatchBodyTest.java @@ -36,6 +36,7 @@ import org.opendaylight.restconf.common.patch.PatchContext; import org.opendaylight.restconf.nb.rfc8040.AbstractInstanceIdentifierTest; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.MdsalRestconfStrategy; import org.opendaylight.restconf.server.api.DataPatchPath; +import org.opendaylight.restconf.server.api.PatchBody; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @RunWith(MockitoJUnitRunner.Silent.class) diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java index fc4da82c50..6572f30805 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/AbstractResourceBodyTest.java @@ -30,6 +30,7 @@ import org.opendaylight.restconf.common.errors.RestconfError; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.MdsalRestconfStrategy; import org.opendaylight.restconf.server.api.DataPutPath; import org.opendaylight.restconf.server.api.DatabindContext; +import org.opendaylight.restconf.server.api.ResourceBody; 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/rfc8040/databind/JsonChildBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java index a191d4b68b..f2a60cb6c4 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonChildBodyTest.java @@ -14,6 +14,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opendaylight.restconf.server.api.DataPostPath; import org.opendaylight.restconf.server.api.DatabindContext; +import org.opendaylight.restconf.server.api.JsonChildBody; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBodyTest.java index 23d6ddec5a..401640487a 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonOperationInputBodyTest.java @@ -8,6 +8,8 @@ package org.opendaylight.restconf.nb.rfc8040.databind; import java.io.InputStream; +import org.opendaylight.restconf.server.api.JsonOperationInputBody; +import org.opendaylight.restconf.server.api.OperationInputBody; public class JsonOperationInputBodyTest extends AbstractOperationInputBodyTest { @Override diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBodyTest.java index b581bd0649..82bf5942e3 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonPatchBodyTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertThrows; import org.junit.Test; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; +import org.opendaylight.restconf.server.api.JsonPatchBody; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java index 4dfd51254d..b9a810b910 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/JsonResourceBodyTest.java @@ -11,6 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map; import org.junit.jupiter.api.Test; +import org.opendaylight.restconf.server.api.JsonResourceBody; 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/rfc8040/databind/XmlChildBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java index c860c0e187..6c4935d52f 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlChildBodyTest.java @@ -14,6 +14,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opendaylight.restconf.server.api.DataPostPath; import org.opendaylight.restconf.server.api.DatabindContext; +import org.opendaylight.restconf.server.api.XmlChildBody; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBodyTest.java index cc6998164b..6677ee8e8a 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlOperationInputBodyTest.java @@ -8,6 +8,8 @@ package org.opendaylight.restconf.nb.rfc8040.databind; import java.io.InputStream; +import org.opendaylight.restconf.server.api.OperationInputBody; +import org.opendaylight.restconf.server.api.XmlOperationInputBody; public class XmlOperationInputBodyTest extends AbstractOperationInputBodyTest { @Override diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBodyTest.java index bb3646e2ec..e3bb0673d7 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlPatchBodyTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertThrows; import org.junit.Test; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; +import org.opendaylight.restconf.server.api.XmlPatchBody; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBodyTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBodyTest.java index 7b648ae357..0737817497 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBodyTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/XmlResourceBodyTest.java @@ -23,6 +23,7 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService; import org.opendaylight.netconf.dom.api.NetconfDataTreeService; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; +import org.opendaylight.restconf.server.api.XmlResourceBody; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.QName;