Bump upstreams

Adopt:
- odlparent-13.1.2
- yangtools-13.0.5
- mdsal-13.0.3

Also adjusts for the removal of DOMActionResult.

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

diff --git a/akka/pom.xml b/akka/pom.xml
index afd11d74106310b8f6d9a518096119dd45203779..5b9f7c80aebff33fa2d72b2d9b385c286ccd0760 100644 (file)
--- a/akka/pom.xml
+++ b/akka/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml
index 6c62c5d247c286ead6f506280a94affee1c076cc..e996897a1c1c3363b15e1789223d627a2c3345f3 100644 (file)
--- a/akka/repackaged-akka-jar/pom.xml
+++ b/akka/repackaged-akka-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 79e8d88f08ab0a1c147aa77d8801def96d6ac31b..29b52d85cacdaf0d5c72fb01b0ad411166d29105 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index b79dbd5b8c2b3220cae6aeebd132bd49b254d946..cf4c295a768aa4572d4b38c4c86dd51b5104f106 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 5d373d3f372a68cab3eca96abc31676191139213..e3fe98e0bf7b81b607bfe77d1d630ffa90443cd6 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>13.0.1</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 22c11bcb3cb9aaf90e66592d343e3f425deaccf9..618df02e59137422a91ab0ff59a3648daccb46cf 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 
@@ -211,9 +211,9 @@
                         <link>https://netty.io/4.1/api/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.11/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/13.0.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/13.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.1.2/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/13.0.5/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/13.0.3/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index 6401adb5fe235bc7a5e3d2fd0b95a59e4c3665f5..a85eddfc5cfafe831009f95045c74fb9981ec293 100644 (file)
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml
index fb095fe8a15a78ea5c7dd237bde0d96266b68f87..aea664830d94c1ba7b9334a86e9589478814a0fa 100644 (file)
--- a/features/features-controller-testing/pom.xml
+++ b/features/features-controller-testing/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index 64d72cf7c7ac45ab52ee7d683551303c01584440..5e996f7c4310c7e9ee406efb9ba52df6648a8a8f 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 97ade422e27ceb93f12e2209f598f19fff641e95..17ce98e76b3f60c15c5e15964fcb84170afa63e2 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml
index 556d3acd7632b2313b4d00dcf771314c51fc3df0..e8fdd6b6f59321e0202670919ac6ec5f7b653ccd 100644 (file)
--- a/features/single-feature-parent/pom.xml
+++ b/features/single-feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/jolokia/pom.xml b/jolokia/pom.xml
index 1d98663b1f762f3e9c255ab26d9ee0182be1ebe9..ee766e982a261ea7c534ca7ef9ae03932af28d3f 100644 (file)
--- a/jolokia/pom.xml
+++ b/jolokia/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 56869cc048d81cf36757c86e5c7dd09b046d994f..f13690f71a83cd6cdd2f147ea8856de29606346f 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 2b7bfeb106fd238f80a03c86e354f6ebcd426ee0..3b74b875ea2db8f47883de880767c05402327b56 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>13.0.2</version>
+        <version>13.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>13.0.1</version>
+        <version>13.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 77e751dd0e4bb94a38d39022d3d840cde52c3d80..045c3f92c1fe451f8f7c17cec36beaa0f35c78cd 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>13.0.1</version>
+        <version>13.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 3ea3d8e4a026aab70959b55271bedc4a618f6961..bcae2bd00833efa6b9c3382e1338d3451d88d726 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 2cd8d0ac1bdb5c90799694b41a02e850fc2ca529..22aa0888e2d08af72c3f0f31475d082e8131d439 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>13.0.1</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 86f5e203f2323fdbf6b8c551a0431ac01243a09d..e3171a1df805d25bdf5dc92ec36f9baf0729fe7c 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index 4c6291230764d62531a6c194c435c11d59beac65..d6b4ded112689f97c5a00dc5032a1407349a9be9 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java
index dcb930e8ca3482c12d471625e7e62e4eb379591c..2d2bd7933830178e05dc996b29420504bb5114af 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OpsInvoker.java
@@ -24,7 +24,6 @@ import org.opendaylight.controller.remote.rpc.messages.ActionResponse;
 import org.opendaylight.controller.remote.rpc.messages.ExecuteAction;
 import org.opendaylight.controller.remote.rpc.messages.ExecuteRpc;
 import org.opendaylight.controller.remote.rpc.messages.RpcResponse;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
@@ -117,7 +116,7 @@ final class OpsInvoker extends AbstractUntypedActor {
 
         final ActorRef sender = getSender();
 
-        final ListenableFuture<? extends DOMActionResult> future;
+        final ListenableFuture<? extends DOMRpcResult> future;
         try {
             future = actionService.invokeAction(msg.getType(), msg.getPath(), msg.getInput());
         } catch (final RuntimeException e) {
@@ -126,16 +125,16 @@ final class OpsInvoker extends AbstractUntypedActor {
             return;
         }
 
-        Futures.addCallback(future, new AbstractCallback<Absolute, DOMActionResult>(getSender(), msg.getType()) {
+        Futures.addCallback(future, new AbstractCallback<Absolute, DOMRpcResult>(getSender(), msg.getType()) {
             @Override
             Object nullResponse(final Absolute type) {
                 throw new IllegalStateException("Null invocation result of action " + type);
             }
 
             @Override
-            Object response(final Absolute type, final DOMActionResult result) {
-                final Collection<? extends RpcError> errors = result.getErrors();
-                return errors.isEmpty() ? new ActionResponse(result.getOutput(), result.getErrors())
+            Object response(final Absolute type, final DOMRpcResult result) {
+                final var errors = result.errors();
+                return errors.isEmpty() ? new ActionResponse(result.value(), errors)
                     // This is legacy (wrong) behavior, which ignores the fact that errors may be just warnings,
                     // discarding any output
                     : new Failure(new RpcErrorsException(String.format("Execution of action %s failed", type),

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteActionImplementation.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteActionImplementation.java
index 2b78806ba2c0855b74deb94b2129dccdb59f6198..7a91fa0c20be0515b638ef968fcba20f9bc57afd 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteActionImplementation.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteActionImplementation.java
@@ -11,8 +11,8 @@ import akka.actor.ActorRef;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.controller.remote.rpc.messages.ExecuteAction;
 import org.opendaylight.mdsal.dom.api.DOMActionImplementation;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 import org.slf4j.Logger;
@@ -33,8 +33,8 @@ final class RemoteActionImplementation extends AbstractRemoteImplementation<Exec
      * Routes action request to a remote invoker, which will execute the action and return with result.
      */
     @Override
-    public ListenableFuture<DOMActionResult> invokeAction(final Absolute type, final DOMDataTreeIdentifier path,
-                                                          final ContainerNode input) {
+    public ListenableFuture<DOMRpcResult> invokeAction(final Absolute type, final DOMDataTreeIdentifier path,
+            final ContainerNode input) {
         LOG.debug("invoking action {} with path {}", type, path);
         return new RemoteDOMActionFuture(type, ask(ExecuteAction.from(type, path, input)));
     }

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMActionFuture.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMActionFuture.java
index 9d9e29ad36befc04617a39f804fdc003b27fa3eb..c1cf1d5b02aa4810dad50d595afe5035eb739e40 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMActionFuture.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMActionFuture.java
@@ -10,23 +10,23 @@ package org.opendaylight.controller.remote.rpc;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.remote.rpc.messages.ActionResponse;
 import org.opendaylight.mdsal.dom.api.DOMActionException;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
-import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 import scala.concurrent.Future;
 
-final class RemoteDOMActionFuture extends AbstractRemoteFuture<Absolute, DOMActionResult, DOMActionException> {
+final class RemoteDOMActionFuture extends AbstractRemoteFuture<Absolute, DOMRpcResult, DOMActionException> {
     RemoteDOMActionFuture(final @NonNull Absolute type, final @NonNull Future<Object> requestFuture) {
         super(type, requestFuture);
     }
 
     @Override
-    DOMActionResult processReply(final Object reply) {
+    DOMRpcResult processReply(final Object reply) {
         if (reply instanceof ActionResponse actionReply) {
             final ContainerNode output = actionReply.getOutput();
-            return output == null ? new SimpleDOMActionResult(actionReply.getErrors())
-                    : new SimpleDOMActionResult(output, actionReply.getErrors());
+            return output == null ? new DefaultDOMRpcResult(actionReply.getErrors())
+                    : new DefaultDOMRpcResult(output, actionReply.getErrors());
         }
 
         return null;

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ActionResponse.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ActionResponse.java
index 145f86fba444a65a4a66029e958a93061357a544..09d68d63e3f7b6c9dd3f4071b814df0601996dde 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ActionResponse.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ActionResponse.java
@@ -16,21 +16,21 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Collection;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
 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;
 
 @SuppressFBWarnings({"SE_TRANSIENT_FIELD_NOT_RESTORED", "DMI_NONSERIALIZABLE_OBJECT_WRITTEN"})
 public class ActionResponse extends AbstractResponse<ContainerNode> {
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private final transient @NonNull ImmutableList<@NonNull RpcError> errors;
 
-    public ActionResponse(final @NonNull Optional<ContainerNode> output, @NonNull final Collection<RpcError> errors) {
-        super(output.orElse(null));
+    public ActionResponse(final @Nullable ContainerNode output, @NonNull final Collection<? extends RpcError> errors) {
+        super(output);
         this.errors = ImmutableList.copyOf(errors);
     }
 
@@ -67,9 +67,9 @@ public class ActionResponse extends AbstractResponse<ContainerNode> {
         @Override
         public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
             @SuppressWarnings("unchecked")
-            final ImmutableList<RpcError> errors = (ImmutableList<RpcError>) in.readObject();
-            final Optional<NormalizedNode> output = SerializationUtils.readNormalizedNode(in);
-            actionResponse = new ActionResponse(output.map(ContainerNode.class::cast), errors);
+            final var errors = (ImmutableList<RpcError>) in.readObject();
+            final var output = SerializationUtils.readNormalizedNode(in);
+            actionResponse = new ActionResponse(output.map(ContainerNode.class::cast).orElse(null), errors);
         }
 
         private Object readResolve() {

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java
index 2e94f83866cff960bcdab1467492eba7c7622475..1ea532b1d43fc3a51b4de5d26fdad8751f2711ed 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteOpsImplementationTest.java
@@ -19,19 +19,16 @@ import static org.mockito.Mockito.doThrow;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collections;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.opendaylight.mdsal.dom.api.DOMActionException;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
-import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -72,17 +69,17 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
     @Test
     public void testInvokeAction() throws Exception {
         final ContainerNode actionOutput = makeRPCOutput("bar");
-        final DOMActionResult actionResult = new SimpleDOMActionResult(actionOutput, Collections.emptyList());
+        final DOMRpcResult actionResult = new DefaultDOMRpcResult(actionOutput, Collections.emptyList());
         final NormalizedNode invokeActionInput = makeRPCInput("foo");
         final ArgumentCaptor<ContainerNode> inputCaptor =
                 ArgumentCaptor.forClass(ContainerNode.class);
         doReturn(FluentFutures.immediateFluentFuture(actionResult)).when(domActionService2).invokeAction(
                 eq(TEST_RPC_TYPE), eq(TEST_DATA_TREE_ID), inputCaptor.capture());
-        final ListenableFuture<DOMActionResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
+        final ListenableFuture<DOMRpcResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
                 TEST_DATA_TREE_ID, (ContainerNode) invokeActionInput);
         assertThat(frontEndFuture, instanceOf(RemoteDOMActionFuture.class));
-        final DOMActionResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
-        assertEquals(Optional.of(actionOutput), result.getOutput());
+        final DOMRpcResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
+        assertEquals(actionOutput, result.value());
     }
 
     /**
@@ -111,18 +108,18 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
     @Test
     public void testInvokeActionWithNullInput() throws Exception {
         final ContainerNode actionOutput = makeRPCOutput("bar");
-        final DOMActionResult actionResult = new SimpleDOMActionResult(actionOutput);
+        final DOMRpcResult actionResult = new DefaultDOMRpcResult(actionOutput);
 
         final ArgumentCaptor<ContainerNode> inputCaptor = ArgumentCaptor.forClass(ContainerNode.class);
         doReturn(FluentFutures.immediateFluentFuture(actionResult)).when(domActionService2).invokeAction(
                 eq(TEST_RPC_TYPE), eq(TEST_DATA_TREE_ID), inputCaptor.capture());
 
-        ListenableFuture<DOMActionResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
+        ListenableFuture<DOMRpcResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
                 TEST_DATA_TREE_ID, actionOutput);
         assertThat(frontEndFuture, instanceOf(RemoteDOMActionFuture.class));
 
-        final DOMActionResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
-        assertEquals(Optional.of(actionOutput), result.getOutput());
+        final DOMRpcResult result = frontEndFuture.get(5, TimeUnit.SECONDS);
+        assertEquals(actionOutput, result.value());
     }
 
     /**
@@ -175,7 +172,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         doReturn(FluentFutures.immediateFailedFluentFuture(new RemoteDOMRpcException("Test Exception", null)))
             .when(domActionService2).invokeAction(eq(TEST_RPC_TYPE), eq(TEST_DATA_TREE_ID), inputCaptor.capture());
 
-        final ListenableFuture<DOMActionResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
+        final ListenableFuture<DOMRpcResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
                 TEST_DATA_TREE_ID, invokeActionInput);
         assertThat(frontEndFuture, instanceOf(RemoteDOMActionFuture.class));
 
@@ -225,7 +222,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest {
         doThrow(new RuntimeException("test")).when(domActionService2).invokeAction(any(Absolute.class),
                 any(DOMDataTreeIdentifier.class), any(ContainerNode.class));
 
-        final ListenableFuture<DOMActionResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
+        final ListenableFuture<DOMRpcResult> frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE,
                 TEST_DATA_TREE_ID, invokeRpcInput);
         assertThat(frontEndFuture, instanceOf(RemoteDOMActionFuture.class));
 

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/messages/OpsResponseTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/messages/OpsResponseTest.java
index 495707557fd8bcfaf0e3063532c5c49b46c79083..54fd55cfdfb70a6ec74ab064a166a0280275bd06 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/messages/OpsResponseTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/messages/OpsResponseTest.java
@@ -9,8 +9,7 @@ package org.opendaylight.controller.remote.rpc.messages;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
-import java.util.Optional;
+import java.util.List;
 import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Test;
 import org.opendaylight.controller.remote.rpc.AbstractOpsTest;
@@ -26,17 +25,15 @@ public class OpsResponseTest {
     public void testSerialization() {
         RpcResponse expectedRpc = new RpcResponse(AbstractOpsTest.makeRPCOutput("serialization-test"));
 
-        ActionResponse expectedAction = new ActionResponse(
-            Optional.of(AbstractOpsTest.makeRPCOutput("serialization-test")), Collections.emptyList());
+        ActionResponse expectedAction = new ActionResponse(AbstractOpsTest.makeRPCOutput("serialization-test"),
+            List.of());
 
         RpcResponse actualRpc = SerializationUtils.clone(expectedRpc);
 
         ActionResponse actualAction = SerializationUtils.clone(expectedAction);
 
-        assertEquals("getResultNormalizedNode", expectedRpc.getOutput(),
-                actualRpc.getOutput());
+        assertEquals("getResultNormalizedNode", expectedRpc.getOutput(), actualRpc.getOutput());
 
-        assertEquals("getResultNormalizedNode", expectedAction.getOutput(),
-                actualAction.getOutput());
+        assertEquals("getResultNormalizedNode", expectedAction.getOutput(), actualAction.getOutput());
     }
 }

diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
index 0fc796cac834888b71c1ff78aa0d70ff69af340d..a98403eb5b3d94ccd5eefd1cab0e6e2d8cec7dd8 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
index b83c335a94814528cee09ae79dd37a116410ea05..6af0402ecb994c317b0ed4392fc99ec49cc9ac22 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index 80752933e0502c991609d3a35a1b943f1aafa905..8f9187658d53be9d5be695860dfeab3410a9b6c5 100644 (file)
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 7b3c5253d3436995679581f4a81f90b0ef037cf9..dfb329c18a62aa1d917488662b52dfc7ec502681 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.11</version>
+    <version>13.1.2</version>
     <relativePath/>
   </parent>