Require ContainerNode in input/output

Actions/RPCs really take a container, not anything else.

Change-Id: I3aa576bd65143b522d67941a12a5d6bb3483e37b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationAvailabilityExtension.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationAvailabilityExtension.java
index cb805c750db8b31e7ae47eab92c7e3e00b8c004c..899868a8ef729b870eef5f7a89b98a899088d1eb 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationAvailabilityExtension.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationAvailabilityExtension.java
@@ -14,7 +14,7 @@ import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 /**
@@ -33,8 +33,8 @@ public interface DOMOperationAvailabilityExtension extends DOMOperationServiceEx
      *
      * <p>
      * Users should note that using a listener does not necessarily mean that
-     * {@link DOMOperationService#invokeRpc(QName, NormalizedNode, DOMOperationCallback, Executor)} and
-     * {@link DOMOperationService#invokeAction(SchemaPath, DOMDataTreeIdentifier, NormalizedNode)} will not report
+     * {@link DOMOperationService#invokeRpc(QName, ContainerNode, DOMOperationCallback, Executor)} and
+     * {@link DOMOperationService#invokeAction(SchemaPath, DOMDataTreeIdentifier, ContainerNode)} will not report
      * a failure due to {@link DOMOperationNotAvailableException} and need to be ready to handle it.
      *
      * <p>

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationImplementation.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationImplementation.java
index 0f599dca97dcfe491ba3b6b704630cc340dd3ada..1b44315a1958d39b0844bf3f3b532a547ff36879 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationImplementation.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationImplementation.java
@@ -11,7 +11,7 @@ import com.google.common.annotations.Beta;
 import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
@@ -40,7 +40,7 @@ public interface DOMOperationImplementation {
          * @param callbackExecutor Executor to use for executing the callback
          * @throws NullPointerException if any of the arguments is null
          */
-        void invokeAction(SchemaPath type, DOMDataTreeIdentifier path, NormalizedNode<?, ?> input,
+        void invokeAction(SchemaPath type, DOMDataTreeIdentifier path, ContainerNode input,
                 DOMOperationCallback callback, Executor callbackExecutor);
     }
 
@@ -58,8 +58,7 @@ public interface DOMOperationImplementation {
          * @param callbackExecutor Executor to use for executing the callback
          * @throws NullPointerException if any of the arguments is null
          */
-        void invokeRpc(QName type, NormalizedNode<?, ?> input, DOMOperationCallback callback,
-                Executor callbackExecutor);
+        void invokeRpc(QName type, ContainerNode input, DOMOperationCallback callback, Executor callbackExecutor);
     }
 
     /**

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java
index da073349c691ff4701459bc19052f480230dd26e..27d30b9f37ae5faa0f5385729299e36e50889199 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java
@@ -15,7 +15,7 @@ import com.google.common.util.concurrent.SettableFuture;
 import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
@@ -38,7 +38,7 @@ public interface DOMOperationService extends DOMExtensibleService<DOMOperationSe
      * @param callbackExecutor Executor to use for executing the callback
      * @throws NullPointerException if any of the arguments is null
      */
-    void invokeRpc(QName type, NormalizedNode<?, ?> input, DOMOperationCallback callback,
+    void invokeRpc(QName type, ContainerNode input, DOMOperationCallback callback,
             Executor callbackExecutor);
 
     /**
@@ -49,7 +49,7 @@ public interface DOMOperationService extends DOMExtensibleService<DOMOperationSe
      * @return A FluentFuture which completes with the result of invocation
      * @throws NullPointerException if any of the arguments is null
      */
-    default FluentFuture<DOMOperationResult> invokeRpc(final QName type, final NormalizedNode<?, ?> input) {
+    default FluentFuture<DOMOperationResult> invokeRpc(final QName type, final ContainerNode input) {
         final SettableFuture<DOMOperationResult> future = SettableFuture.create();
         invokeRpc(type, input, DOMOperationCallback.completingFuture(future), directExecutor());
         return future;
@@ -66,8 +66,8 @@ public interface DOMOperationService extends DOMExtensibleService<DOMOperationSe
      * @param callbackExecutor Executor to use for executing the callback
      * @throws NullPointerException if any of the arguments is null
      */
-    void invokeAction(SchemaPath type, DOMDataTreeIdentifier path,
-            NormalizedNode<?, ?> input, DOMOperationCallback callback, Executor callbackExecutor);
+    void invokeAction(SchemaPath type, DOMDataTreeIdentifier path, ContainerNode input, DOMOperationCallback callback,
+            Executor callbackExecutor);
 
     /**
      * Initiate invocation of an Action. This method is guaranteed to not block on any external resources.
@@ -80,7 +80,7 @@ public interface DOMOperationService extends DOMExtensibleService<DOMOperationSe
      * @throws NullPointerException if any of the arguments is null
      */
     default FluentFuture<DOMOperationResult> invokeAction(final SchemaPath type, final DOMDataTreeIdentifier path,
-            final NormalizedNode<?, ?> input) {
+            final ContainerNode input) {
         final SettableFuture<DOMOperationResult> future = SettableFuture.create();
         invokeAction(type, path, input, DOMOperationCallback.completingFuture(future), directExecutor());
         return future;