From db7aba121dd8f6b4ee793325a31d91e28e0185d3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 23 Apr 2020 16:17:13 +0200 Subject: [PATCH] Turn DOMRpcResult's result back to NormalizedNode Eventhough we really want to have ContainerNode here, NETCONF is utterly misusing normalization to tunnel AnyXmlNode here. Revert the change donewwwe have done, so that it continues to work. JIRA: MDSAL-303 Change-Id: Ie675609fe4dc5e77e1f4e8ee2ea471a9f1d3d87b Signed-off-by: Robert Varga --- .../java/org/opendaylight/mdsal/dom/api/DOMRpcResult.java | 4 ++-- .../opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java | 3 ++- .../opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java | 7 +++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMRpcResult.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMRpcResult.java index 66feb0f68d..5a0fd1acc0 100644 --- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMRpcResult.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMRpcResult.java @@ -11,7 +11,7 @@ import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.common.RpcError; -import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * Interface defining a result of an RPC call. @@ -33,5 +33,5 @@ public interface DOMRpcResult { * @return Invocation result, null if the operation has not produced a result. This might * be the case if the operation does not produce a result, or if it failed. */ - @Nullable ContainerNode getResult(); + @Nullable NormalizedNode getResult(); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java index 87eb55c3c7..09bcbcb620 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java @@ -22,6 +22,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * Utility class implementing {@link DefaultDOMRpcResult}. @@ -67,7 +68,7 @@ public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Seria } @Override - public @Nullable ContainerNode getResult() { + public @Nullable NormalizedNode getResult() { return result; } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java index 429fb9a03d..3b5af47971 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java @@ -13,11 +13,10 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.yangtools.yang.common.RpcError; -import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** - * Utility class which implements {@link DOMRpcResult} by forwarding all methods - * to a backing instance. + * Utility class which implements {@link DOMRpcResult} by forwarding all methods to a backing instance. */ @NonNullByDefault public abstract class ForwardingDOMRpcResult extends ForwardingObject implements DOMRpcResult { @@ -30,7 +29,7 @@ public abstract class ForwardingDOMRpcResult extends ForwardingObject implements } @Override - public @Nullable ContainerNode getResult() { + public @Nullable NormalizedNode getResult() { return delegate().getResult(); } } -- 2.36.6