From b07e78baf5cbb64b2e730240948bdf589106c753 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 15 May 2024 17:13:02 +0200 Subject: [PATCH] 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 --- .../singleton/impl/ProxyDOMActionService.java | 17 ++++++++--------- .../impl/actors/NetconfNodeActor.java | 14 ++++++-------- .../singleton/impl/NetconfNodeActorTest.java | 17 +++++++---------- apps/pom.xml | 2 +- artifacts/pom.xml | 2 +- .../features-netconf-experimental/pom.xml | 2 +- features/features-netconf-testing/pom.xml | 2 +- features/features-netconf/pom.xml | 2 +- features/parent/pom.xml | 2 +- features/pom.xml | 2 +- karaf-static/pom.xml | 2 +- karaf/pom.xml | 6 +++--- keystore/pom.xml | 2 +- model/pom.xml | 2 +- netconf/pom.xml | 2 +- netconf/tools/pom.xml | 2 +- parent/pom.xml | 8 ++++---- .../client/mdsal/api/ActionTransformer.java | 6 +++--- .../mdsal/impl/NetconfMessageTransformer.java | 8 +++----- .../impl/NetconfMessageTransformerTest.java | 6 +++--- plugins/pom.xml | 2 +- pom.xml | 2 +- protocol/pom.xml | 2 +- restconf/pom.xml | 2 +- .../rests/transactions/RestconfStrategy.java | 19 +++++++++---------- .../restconf/nb/jaxrs/Netconf799Test.java | 6 +++--- restconf/sal-rest-connector-config/pom.xml | 2 +- third-party/pom.xml | 2 +- third-party/shaded-exificient-jar/pom.xml | 2 +- third-party/shaded-exificient/pom.xml | 2 +- third-party/shaded-sshd-jar/pom.xml | 2 +- third-party/shaded-sshd/pom.xml | 2 +- transport/pom.xml | 2 +- truststore/pom.xml | 2 +- 34 files changed, 73 insertions(+), 82 deletions(-) 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 522b335259..e53e947e40 100644 --- 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 invokeAction(final Absolute type, + public FluentFuture 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 scalaFuture = Patterns.ask(masterActorRef, new InvokeActionMessage( new SchemaPathMessage(type), containerNodeMessage, domDataTreeIdentifier), actorResponseWaitTime); - final SettableFuture settableFuture = SettableFuture.create(); + final SettableFuture 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 c58716c2aa..f19081c889 100644 --- 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 actionResult = deviceAction.invokeAction(schemaPath, + final var actionResult = deviceAction.invokeAction(schemaPath, domDataTreeIdentifier, containerNodeMessage != null ? containerNodeMessage.getNode() : null); - Futures.addCallback(actionResult, new FutureCallback() { - + Futures.addCallback(actionResult, new FutureCallback() { @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 19fd22da6f..20e99f59f0 100644 --- 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 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 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 99b3b994f2..38abd31e14 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 44934fbe5c..829167bc6f 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/features/features-netconf-experimental/pom.xml b/features/features-netconf-experimental/pom.xml index 0092746f9c..3c8d651cbf 100644 --- a/features/features-netconf-experimental/pom.xml +++ b/features/features-netconf-experimental/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.2 diff --git a/features/features-netconf-testing/pom.xml b/features/features-netconf-testing/pom.xml index 27ae0d6b73..77edbec0cb 100644 --- a/features/features-netconf-testing/pom.xml +++ b/features/features-netconf-testing/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.2 diff --git a/features/features-netconf/pom.xml b/features/features-netconf/pom.xml index 590cfe69d5..062c419c7d 100644 --- a/features/features-netconf/pom.xml +++ b/features/features-netconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.2 diff --git a/features/parent/pom.xml b/features/parent/pom.xml index 5751927b80..94a6f2f407 100644 --- a/features/parent/pom.xml +++ b/features/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.2 diff --git a/features/pom.xml b/features/pom.xml index 8d3fd0342a..f1c97c1a6d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml index c7bd6e6cc1..5ff4eac95d 100644 --- a/karaf-static/pom.xml +++ b/karaf-static/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf-dist-static - 13.0.11 + 13.1.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 2b8356f46e..d97ec3f800 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.11 + 13.1.2 org.opendaylight.netconf @@ -24,14 +24,14 @@ org.opendaylight.infrautils infrautils-artifacts - 6.0.6 + 6.0.8 pom import org.opendaylight.controller controller-artifacts - 9.0.2 + 9.0.3 pom import diff --git a/keystore/pom.xml b/keystore/pom.xml index 01899e006a..97d94208ff 100644 --- a/keystore/pom.xml +++ b/keystore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/model/pom.xml b/model/pom.xml index 3ae4af8d61..4187cec434 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/netconf/pom.xml b/netconf/pom.xml index 0bc6a9110d..9993a0636f 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index b6dd74a450..40f9143dea 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/parent/pom.xml b/parent/pom.xml index 6900ff19fa..958f616c29 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.3 @@ -25,21 +25,21 @@ org.opendaylight.infrautils infrautils-artifacts - 6.0.6 + 6.0.8 pom import org.opendaylight.aaa aaa-artifacts - 0.19.3 + 0.19.4 pom import org.opendaylight.controller bundle-parent - 9.0.2 + 9.0.3 pom import 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 91c0d71e64..c794bda3c5 100644 --- 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 44c37ea864..e82e9ce2a2 100644 --- 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 6e4c6c402f..3f8c776a0d 100644 --- 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 { """)); 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 c504fd7732..1e2ca6df46 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/pom.xml b/pom.xml index d2f10a0032..e517169dcc 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/protocol/pom.xml b/protocol/pom.xml index 98bb124b0c..d443b7800f 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/restconf/pom.xml b/restconf/pom.xml index fbdaef2b3b..33a3812778 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 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 93111ef9bd..86c00c7efa 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 @@ -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 dataInvokePOST(final DOMActionService actionService, + private static RestconfFuture dataInvokePOST(final DOMActionService actionService, final Action path, final @NonNull ContainerNode input) { - final var ret = new SettableRestconfFuture(); + final var ret = new SettableRestconfFuture(); Futures.addCallback(actionService.invokeAction( path.inference().toSchemaInferenceStack().toSchemaNodeIdentifier(), DOMDataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, path.instance()), input), - new FutureCallback() { + new FutureCallback() { @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 ab52d30d94..c5149112f4 100644 --- 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 7b2a6f56d1..be35dce2a7 100644 --- a/restconf/sal-rest-connector-config/pom.xml +++ b/restconf/sal-rest-connector-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/third-party/pom.xml b/third-party/pom.xml index 08337863f9..2d34bb2216 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/third-party/shaded-exificient-jar/pom.xml b/third-party/shaded-exificient-jar/pom.xml index 48be4c93b1..6c0b2cee72 100644 --- a/third-party/shaded-exificient-jar/pom.xml +++ b/third-party/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 13.0.11 + 13.1.2 diff --git a/third-party/shaded-exificient/pom.xml b/third-party/shaded-exificient/pom.xml index d6ca900856..6a68e78038 100644 --- a/third-party/shaded-exificient/pom.xml +++ b/third-party/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.11 + 13.1.2 diff --git a/third-party/shaded-sshd-jar/pom.xml b/third-party/shaded-sshd-jar/pom.xml index 1c8eab9955..8e790a9d9d 100644 --- a/third-party/shaded-sshd-jar/pom.xml +++ b/third-party/shaded-sshd-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 13.0.11 + 13.1.2 diff --git a/third-party/shaded-sshd/pom.xml b/third-party/shaded-sshd/pom.xml index a4091511c1..011918aefd 100644 --- a/third-party/shaded-sshd/pom.xml +++ b/third-party/shaded-sshd/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.11 + 13.1.2 diff --git a/transport/pom.xml b/transport/pom.xml index 6622e084b0..95896fca07 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/truststore/pom.xml b/truststore/pom.xml index 5c54677f83..6248760e5c 100644 --- a/truststore/pom.xml +++ b/truststore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 -- 2.36.6