Bump upstreams

Adopt:
- odlparent-13.1.2
- infrautils-6.0.8
- yangtools-13.0.5
- mdsal-13.0.3
- controller-9.0.3
- aaa-0.19.4

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

diff --git a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMActionService.java b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMActionService.java
index 522b335259a456ac8c98e4aa4bfe873df3c11a54..e53e947e40b0a33d4b73d07f95c82645fb70a880 100644 (file)
--- a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMActionService.java
+++ b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMActionService.java
@@ -18,10 +18,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Collection;
-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.spi.SimpleDOMActionResult;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices.Actions;
 import org.opendaylight.netconf.topology.singleton.impl.utils.ClusteringActionException;
@@ -40,7 +40,7 @@ import scala.concurrent.Future;
 /**
  * Implementation of {@link DOMActionService} provided by device in Odl-Cluster environment to invoke action.
  * Communicates action message {@link InvokeActionMessage} to {@link ActorSystem} using {@link ActorRef} and transforms
- * replied NETCONF message to action result, using {@link SimpleDOMActionResult}.
+ * replied NETCONF message to action result, using {@link DefaultDOMRpcResult}.
  */
 public class ProxyDOMActionService implements Actions.Normalized {
     private static final Logger LOG = LoggerFactory.getLogger(ProxyDOMActionService.class);
@@ -67,7 +67,7 @@ public class ProxyDOMActionService implements Actions.Normalized {
     }
 
     @Override
-    public FluentFuture<DOMActionResult> invokeAction(final Absolute type,
+    public FluentFuture<DOMRpcResult> invokeAction(final Absolute type,
             final DOMDataTreeIdentifier domDataTreeIdentifier, final ContainerNode input) {
         requireNonNull(type);
         requireNonNull(input);
@@ -79,7 +79,7 @@ public class ProxyDOMActionService implements Actions.Normalized {
         final Future<Object> scalaFuture = Patterns.ask(masterActorRef, new InvokeActionMessage(
             new SchemaPathMessage(type), containerNodeMessage, domDataTreeIdentifier), actorResponseWaitTime);
 
-        final SettableFuture<DOMActionResult> settableFuture = SettableFuture.create();
+        final SettableFuture<DOMRpcResult> settableFuture = SettableFuture.create();
 
         scalaFuture.onComplete(new OnComplete<>() {
             @Override
@@ -103,12 +103,11 @@ public class ProxyDOMActionService implements Actions.Normalized {
                 final ContainerNodeMessage containerNodeMessage =
                     ((InvokeActionMessageReply) response).getContainerNodeMessage();
 
-                final DOMActionResult result;
-
+                final DOMRpcResult result;
                 if (containerNodeMessage == null) {
-                    result = new SimpleDOMActionResult(ImmutableList.copyOf(errors));
+                    result = new DefaultDOMRpcResult(ImmutableList.copyOf(errors));
                 } else {
-                    result = new SimpleDOMActionResult(containerNodeMessage.getNode(), ImmutableList.copyOf(errors));
+                    result = new DefaultDOMRpcResult(containerNodeMessage.getNode(), ImmutableList.copyOf(errors));
                 }
                 settableFuture.set(result);
             }

diff --git a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java
index c58716c2aa6e100ae11bb50b846a487602b26f70..f19081c889ce23ca6f76005e997ff07c9d7bd40e 100644 (file)
--- a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java
+++ b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
 import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor;
 import org.opendaylight.controller.cluster.schema.provider.impl.RemoteSchemaProvider;
 import org.opendaylight.controller.cluster.schema.provider.impl.YangTextSchemaSourceSerializationProxy;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -268,13 +267,12 @@ public class NetconfNodeActor extends AbstractUntypedActor {
         LOG.info("{}: invokeSlaveAction for {}, input: {}, identifier: {} on action service {}", id, schemaPath,
             containerNodeMessage, domDataTreeIdentifier, deviceAction);
 
-        final ListenableFuture<? extends DOMActionResult> actionResult = deviceAction.invokeAction(schemaPath,
+        final var actionResult = deviceAction.invokeAction(schemaPath,
             domDataTreeIdentifier, containerNodeMessage != null ? containerNodeMessage.getNode() : null);
 
-        Futures.addCallback(actionResult, new FutureCallback<DOMActionResult>() {
-
+        Futures.addCallback(actionResult, new FutureCallback<DOMRpcResult>() {
             @Override
-            public void onSuccess(final DOMActionResult domActionResult) {
+            public void onSuccess(final DOMRpcResult domActionResult) {
                 LOG.debug("{}: invokeSlaveAction for {}, domActionResult: {}", id, schemaPath, domActionResult);
                 if (domActionResult == null) {
                     recipient.tell(new EmptyResultResponse(), getSender());
@@ -282,9 +280,9 @@ public class NetconfNodeActor extends AbstractUntypedActor {
                 }
 
                 //Check DomActionResult containing Ok onSuccess pass empty nodeMessageReply
-                ContainerNodeMessage nodeMessageReply = domActionResult.getOutput().map(ContainerNodeMessage::new)
-                        .orElse(null);
-                recipient.tell(new InvokeActionMessageReply(nodeMessageReply, domActionResult.getErrors()), getSelf());
+                final var value = domActionResult.value();
+                final var nodeMessageReply = value != null ? new ContainerNodeMessage(value) : null;
+                recipient.tell(new InvokeActionMessageReply(nodeMessageReply, domActionResult.errors()), getSelf());
             }
 
             @Override

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java
index 19fd22da6f9083223c97fe0f8d6d39f8f2a61074..20e99f59f00655d6e3c92eb3e0a9016455d6d051 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java
@@ -65,7 +65,6 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMActionException;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -80,7 +79,6 @@ import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
-import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
 import org.opendaylight.netconf.client.mdsal.api.DeviceNetconfSchemaProvider;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices;
@@ -538,7 +536,7 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest {
         initializeMaster(List.of(new SourceIdentifier("testActionID")));
         registerSlaveMountPoint();
 
-        ArgumentCaptor<DOMActionService> domActionServiceCaptor = ArgumentCaptor.forClass(DOMActionService.class);
+        final var domActionServiceCaptor = ArgumentCaptor.forClass(DOMActionService.class);
         verify(mockMountPointBuilder).addService(eq(DOMActionService.class), domActionServiceCaptor.capture());
 
         final DOMActionService slaveDomActionService = domActionServiceCaptor.getValue();
@@ -549,7 +547,7 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest {
 
         final YangInstanceIdentifier yangIIdPath = YangInstanceIdentifier.of(testQName);
 
-        final DOMDataTreeIdentifier domDataTreeIdentifier = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
+        final DOMDataTreeIdentifier domDataTreeIdentifier = DOMDataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL,
             yangIIdPath);
 
         final ContainerNode outputNode = ImmutableNodes.newContainerBuilder()
@@ -559,24 +557,23 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest {
         // Action with no response output.
         doReturn(FluentFutures.immediateNullFluentFuture()).when(mockDOMActionService)
             .invokeAction(any(), any(), any());
-        DOMActionResult result = slaveDomActionService.invokeAction(schemaPath, domDataTreeIdentifier, outputNode)
+        var result = slaveDomActionService.invokeAction(schemaPath, domDataTreeIdentifier, outputNode)
             .get(2, TimeUnit.SECONDS);
         assertEquals(null, result);
 
         // Action with response output.
-        doReturn(FluentFutures.immediateFluentFuture(new SimpleDOMActionResult(outputNode))).when(mockDOMActionService)
+        doReturn(FluentFutures.immediateFluentFuture(new DefaultDOMRpcResult(outputNode))).when(mockDOMActionService)
             .invokeAction(any(), any(), any());
         result = slaveDomActionService.invokeAction(schemaPath, domDataTreeIdentifier, outputNode)
             .get(2, TimeUnit.SECONDS);
 
-        assertEquals(Optional.of(outputNode), result.getOutput());
-        assertTrue(result.getErrors().isEmpty());
+        assertEquals(outputNode, result.value());
+        assertTrue(result.errors().isEmpty());
 
         // Action failure.
         doReturn(FluentFutures.immediateFailedFluentFuture(new ClusteringActionException("mock")))
             .when(mockDOMActionService).invokeAction(any(), any(), any());
-        final ListenableFuture<? extends DOMActionResult> future = slaveDomActionService.invokeAction(schemaPath,
-            domDataTreeIdentifier, outputNode);
+        final var future = slaveDomActionService.invokeAction(schemaPath, domDataTreeIdentifier, outputNode);
 
         final ExecutionException e = assertThrows(ExecutionException.class, () -> future.get(2, TimeUnit.SECONDS));
         final Throwable cause = e.getCause();

diff --git a/apps/pom.xml b/apps/pom.xml
index 99b3b994f204db269f3031aaa8425bd89e6f4d22..38abd31e14121b979f7fa043e39ad5e965a966fb 100644 (file)
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -13,7 +13,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/artifacts/pom.xml b/artifacts/pom.xml
index 44934fbe5c57e62ae6cfa42aec4319f7deb2e38b..829167bc6fab018da3a876e880fc86ed6f2c2510 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/features/features-netconf-experimental/pom.xml b/features/features-netconf-experimental/pom.xml
index 0092746f9cacccf3d492652cd218a6735b366dee..3c8d651cbf3c6a94f74812e3a411c5f3795d2aca 100644 (file)
--- a/features/features-netconf-experimental/pom.xml
+++ b/features/features-netconf-experimental/pom.xml
@@ -14,7 +14,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-netconf-testing/pom.xml b/features/features-netconf-testing/pom.xml
index 27ae0d6b73452250dcf0e4ea4fca761c173b6cf0..77edbec0cb1bb98c9927654ac702c10c04d4d45f 100644 (file)
--- a/features/features-netconf-testing/pom.xml
+++ b/features/features-netconf-testing/pom.xml
@@ -12,7 +12,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-netconf/pom.xml b/features/features-netconf/pom.xml
index 590cfe69d5f3946624d8711255fad14a68a1fa23..062c419c7d96c4d82bf2bdf90c1185c962e58f98 100644 (file)
--- a/features/features-netconf/pom.xml
+++ b/features/features-netconf/pom.xml
@@ -12,7 +12,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/parent/pom.xml b/features/parent/pom.xml
index 5751927b80447b9574005810c4551643a53e4811..94a6f2f40732ea3c4fc1a4666c88960f43dc1962 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,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/features/pom.xml b/features/pom.xml
index 8d3fd0342af7fcd07fda9de792e943ee21326490..f1c97c1a6d0a2c9c73f9afe3bad64c24c0390943 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/karaf-static/pom.xml b/karaf-static/pom.xml
index c7bd6e6cc113a7b28e57a7f6d31f38c4d89301df..5ff4eac95dd770a042dffebebf2f907ec6f580e7 100644 (file)
--- a/karaf-static/pom.xml
+++ b/karaf-static/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-dist-static</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 2b8356f46ea5971de3b9758b6b24542cd4914cfb..d97ec3f8002c4cc125e3801cd161dfdcb09d1c79 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>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,14 +24,14 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.6</version>
+        <version>6.0.8</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>9.0.2</version>
+        <version>9.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/keystore/pom.xml b/keystore/pom.xml
index 01899e006a81d1d48c3b109667f436eb45c6562e..97d94208ff77c5903e90b1717cef632ac5be6ce0 100644 (file)
--- a/keystore/pom.xml
+++ b/keystore/pom.xml
@@ -13,7 +13,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/model/pom.xml b/model/pom.xml
index 3ae4af8d6143ff31cd168c7d00e88dcca0b80a41..4187cec434a573db9893e6e6c91a46d2768f759c 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -13,7 +13,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/netconf/pom.xml b/netconf/pom.xml
index 0bc6a9110dd158537c482b3103da62ba75a4b506..9993a0636f174974dbac7abe04d7d508da489b6c 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,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/netconf/tools/pom.xml b/netconf/tools/pom.xml
index b6dd74a4503e309e212e00e84102d46489251d7d..40f9143dea21964c2bd8adc0eeb4f43cd089e0b6 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/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/parent/pom.xml b/parent/pom.xml
index 6900ff19fa7ecd4af074325006356df1d1537bd7..958f616c29f4d696f9831de454e58bdaaf608ecc 100644 (file)
--- a/parent/pom.xml
+++ b/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>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.6</version>
+        <version>6.0.8</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.19.3</version>
+        <version>0.19.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>9.0.2</version>
+        <version>9.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java
index 91c0d71e6454897d7b688557f6c94177c15d144f..c794bda3c5ee1fcb965d4c72caa442acbd141803 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.netconf.client.mdsal.api;
 
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.netconf.api.messages.NetconfMessage;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
@@ -33,7 +33,7 @@ public interface ActionTransformer {
      *
      * @param action - action schema path
      * @param message - message to parsing
-     * @return {@link DOMActionResult}
+     * @return {@link DOMRpcResult}
      */
-    DOMActionResult toActionResult(Absolute action, NetconfMessage message);
+    DOMRpcResult toActionResult(Absolute action, NetconfMessage message);
 }

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
index 44c37ea8640ffcf9cd9edaf405955f7b19f2d234..e82e9ce2a2e68706e95c7ef6b24480376ca5dbfc 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
@@ -43,13 +43,11 @@ import javax.xml.transform.dom.DOMSource;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMEvent;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
-import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
 import org.opendaylight.netconf.api.messages.NetconfMessage;
 import org.opendaylight.netconf.api.xml.MissingNameSpaceException;
 import org.opendaylight.netconf.api.xml.XmlElement;
@@ -433,15 +431,15 @@ public class NetconfMessageTransformer
     }
 
     @Override
-    public DOMActionResult toActionResult(final Absolute action, final NetconfMessage message) {
+    public DOMRpcResult toActionResult(final Absolute action, final NetconfMessage message) {
         final ActionDefinition actionDefinition = actions.get(action);
         checkArgument(actionDefinition != null, "Action does not exist: %s", action);
         final ContainerNode normalizedNode = parseResult(message, action, actionDefinition);
 
         if (normalizedNode == null) {
-            return new SimpleDOMActionResult(List.of());
+            return new DefaultDOMRpcResult(List.of());
         } else {
-            return new SimpleDOMActionResult(normalizedNode, List.of());
+            return new DefaultDOMRpcResult(normalizedNode, List.of());
         }
     }
 

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java
index 6e4c6c402f62060fff55b7874bebbc5c0d02e04d..3f8c776a0d207abd2e69eee1e04b1b3ce673b046 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java
@@ -833,7 +833,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest {
             </rpc-reply>"""));
         final var actionResult = actionNetconfMessageTransformer.toActionResult(RESET_SERVER_PATH, message);
         assertNotNull(actionResult);
-        final var containerNode = actionResult.getOutput().orElseThrow();
+        final var containerNode = actionResult.value();
         assertNotNull(containerNode);
         assertEquals("now", containerNode.body().iterator().next().body());
     }
@@ -847,7 +847,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest {
         final var actionResult =
             actionNetconfMessageTransformer.toActionResult(CHECK_WITH_OUTPUT_INTERFACE_PATH, message);
         assertNotNull(actionResult);
-        assertTrue(actionResult.getOutput().isEmpty());
+        assertNull(actionResult.value());
     }
 
     @Test
@@ -859,7 +859,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest {
         final var actionResult =
             actionNetconfMessageTransformer.toActionResult(CHECK_WITHOUT_OUTPUT_INTERFACE_PATH, message);
         assertNotNull(actionResult);
-        assertTrue(actionResult.getOutput().isEmpty());
+        assertNull(actionResult.value());
     }
 
     @Test

diff --git a/plugins/pom.xml b/plugins/pom.xml
index c504fd773209f1d10ff12f99309961956489c9b2..1e2ca6df46a3cfa1752e0549ab2f1c9c55e70976 100644 (file)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -13,7 +13,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 d2f10a0032e91e75554842372ffb7deebd632dc9..e517169dccbbb1ff0a83e8cb3545ab686d909755 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,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/protocol/pom.xml b/protocol/pom.xml
index 98bb124b0cc331bbdeb91e4e4a22a7b642566302..d443b7800fd01a0bf176511346ffdaa8a1b0daca 100644 (file)
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -13,7 +13,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/restconf/pom.xml b/restconf/pom.xml
index fbdaef2b3bcd8f600a695ea4c88d3ab7bde2df61..33a38127780a712ed167830ac7c4b6ec80927f7a 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/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/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 93111ef9bdb201f12b4a40b0e1e89440c91ea67f..86c00c7efae27b9c190fab9af5e99b8f2f15a850 100644 (file)
--- 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
@@ -36,7 +36,6 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMActionException;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -47,7 +46,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService.YangTextSourceExtension;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
-import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.FormattableBody;
@@ -1450,7 +1449,7 @@ public abstract class RestconfStrategy implements DatabindAware {
         }
 
         return dataInvokePOST(actionService, path, input)
-            .transform(result -> outputToInvokeResult(path, result.getOutput().orElse(null)));
+            .transform(result -> outputToInvokeResult(path, result.value()));
     }
 
     /**
@@ -1460,19 +1459,19 @@ public abstract class RestconfStrategy implements DatabindAware {
      * @param yangIId invocation context
      * @param schemaPath schema path of data
      * @param actionService action service to invoke action
-     * @return {@link DOMActionResult}
+     * @return {@link DOMRpcResult}
      */
-    private static RestconfFuture<DOMActionResult> dataInvokePOST(final DOMActionService actionService,
+    private static RestconfFuture<DOMRpcResult> dataInvokePOST(final DOMActionService actionService,
             final Action path, final @NonNull ContainerNode input) {
-        final var ret = new SettableRestconfFuture<DOMActionResult>();
+        final var ret = new SettableRestconfFuture<DOMRpcResult>();
 
         Futures.addCallback(actionService.invokeAction(
             path.inference().toSchemaInferenceStack().toSchemaNodeIdentifier(),
             DOMDataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, path.instance()), input),
-            new FutureCallback<DOMActionResult>() {
+            new FutureCallback<DOMRpcResult>() {
                 @Override
-                public void onSuccess(final DOMActionResult result) {
-                    final var errors = result.getErrors();
+                public void onSuccess(final DOMRpcResult result) {
+                    final var errors = result.errors();
                     LOG.debug("InvokeAction Error Message {}", errors);
                     if (errors.isEmpty()) {
                         ret.set(result);
@@ -1484,7 +1483,7 @@ public abstract class RestconfStrategy implements DatabindAware {
                 @Override
                 public void onFailure(final Throwable cause) {
                     if (cause instanceof DOMActionException) {
-                        ret.set(new SimpleDOMActionResult(List.of(RpcResultBuilder.newError(
+                        ret.set(new DefaultDOMRpcResult(List.of(RpcResultBuilder.newError(
                             ErrorType.RPC, ErrorTag.OPERATION_FAILED, cause.getMessage()))));
                     } else if (cause instanceof RestconfDocumentedException e) {
                         ret.setFailure(e);

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/Netconf799Test.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/Netconf799Test.java
index ab52d30d94e90ffeecbf894e8a04c5d4fa410583..c5149112f443989d5fd1bd1da8c3b115e67dc629 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/Netconf799Test.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/Netconf799Test.java
@@ -28,8 +28,8 @@ import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService;
-import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
 import org.opendaylight.restconf.api.ApiPath;
 import org.opendaylight.restconf.api.query.PrettyPrintParam;
 import org.opendaylight.restconf.nb.rfc8040.AbstractInstanceIdentifierTest;
@@ -64,7 +64,7 @@ class Netconf799Test extends AbstractInstanceIdentifierTest {
 
     @Test
     void testInvokeAction() throws Exception {
-        doReturn(Futures.immediateFuture(new SimpleDOMActionResult(ImmutableNodes.newContainerBuilder()
+        doReturn(Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableNodes.newContainerBuilder()
             .withNodeIdentifier(NodeIdentifier.create(OUTPUT_QNAME))
             .build())))
             .when(actionService).invokeAction(eq(RESET_PATH), any(), any());
@@ -89,7 +89,7 @@ class Netconf799Test extends AbstractInstanceIdentifierTest {
 
     @Test
     void testInvokeActionOutput() throws Exception {
-        doReturn(Futures.immediateFuture(new SimpleDOMActionResult(ImmutableNodes.newContainerBuilder()
+        doReturn(Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableNodes.newContainerBuilder()
             .withNodeIdentifier(NodeIdentifier.create(OUTPUT_QNAME))
             .withChild(ImmutableNodes.leafNode(QName.create(OUTPUT_QNAME, "timestamp"), "somevalue"))
             .build())))

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index 7b2a6f56d1fba0d380cb846f737de25b378dcb72..be35dce2a7ebb4b039d32b75cb4ba4096206a98b 100644 (file)
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-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/third-party/pom.xml b/third-party/pom.xml
index 08337863f9bb1f28dd8f42baf96946e9899c7e8b..2d34bb221654f655995e97ba0b8e9286ac65f51d 100644 (file)
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -13,7 +13,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/third-party/shaded-exificient-jar/pom.xml b/third-party/shaded-exificient-jar/pom.xml
index 48be4c93b143d79355ae108c5895f77623d98f6a..6c0b2cee72f7dc3163f9fe9efc85521c416e1e7b 100644 (file)
--- a/third-party/shaded-exificient-jar/pom.xml
+++ b/third-party/shaded-exificient-jar/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>
 

diff --git a/third-party/shaded-exificient/pom.xml b/third-party/shaded-exificient/pom.xml
index d6ca900856e154dc062fcb94b7dba8ad77d793a7..6a68e78038a7e68a9d6c6309b3ff2fc0e33c603e 100644 (file)
--- a/third-party/shaded-exificient/pom.xml
+++ b/third-party/shaded-exificient/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>
 

diff --git a/third-party/shaded-sshd-jar/pom.xml b/third-party/shaded-sshd-jar/pom.xml
index 1c8eab9955cee7780ae750f42969fc2fda4f65ec..8e790a9d9dc980c3cbf8ee238d081df766e49c31 100644 (file)
--- a/third-party/shaded-sshd-jar/pom.xml
+++ b/third-party/shaded-sshd-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/third-party/shaded-sshd/pom.xml b/third-party/shaded-sshd/pom.xml
index a4091511c1666a2fc0945dde39bbb86e56bdcf69..011918aefd7ec8924a85767eeb47fb1721367677 100644 (file)
--- a/third-party/shaded-sshd/pom.xml
+++ b/third-party/shaded-sshd/pom.xml
@@ -13,7 +13,7 @@
     <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/transport/pom.xml b/transport/pom.xml
index 6622e084b0a0c5d89a98810f24fee7d062828df9..95896fca07373cd3fc8f2d04e49174b1767a6067 100644 (file)
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -13,7 +13,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/truststore/pom.xml b/truststore/pom.xml
index 5c54677f8385c9b047a6f36f579c27cdbc867c50..6248760e5cdc40f05cb28220a27891c3c267ae0e 100644 (file)
--- a/truststore/pom.xml
+++ b/truststore/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.11</version>
+        <version>13.1.2</version>
         <relativePath/>
     </parent>