From 812caf20a194c86d208122dbd53f220aa8fd19ae Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 16 Apr 2024 14:05:48 +0200 Subject: [PATCH] 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 --- akka/pom.xml | 2 +- akka/repackaged-akka-jar/pom.xml | 2 +- artifacts/pom.xml | 2 +- benchmark/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- docs/pom.xml | 8 +++---- .../features-controller-experimental/pom.xml | 2 +- features/features-controller-testing/pom.xml | 2 +- features/features-controller/pom.xml | 2 +- features/pom.xml | 2 +- features/single-feature-parent/pom.xml | 2 +- jolokia/pom.xml | 2 +- karaf/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 6 ++--- opendaylight/md-sal/mdsal-it-base/pom.xml | 4 ++-- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../md-sal/sal-clustering-config/pom.xml | 2 +- .../controller/remote/rpc/OpsInvoker.java | 11 ++++----- .../rpc/RemoteActionImplementation.java | 6 ++--- .../remote/rpc/RemoteDOMActionFuture.java | 12 +++++----- .../remote/rpc/messages/ActionResponse.java | 14 +++++------ .../rpc/RemoteOpsImplementationTest.java | 23 ++++++++----------- .../remote/rpc/messages/OpsResponseTest.java | 13 ++++------- .../clustering-test-app/configuration/pom.xml | 2 +- .../samples/clustering-test-app/pom.xml | 2 +- opendaylight/md-sal/samples/pom.xml | 2 +- pom.xml | 2 +- 29 files changed, 65 insertions(+), 72 deletions(-) diff --git a/akka/pom.xml b/akka/pom.xml index afd11d7410..5b9f7c80ae 100644 --- a/akka/pom.xml +++ b/akka/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index 6c62c5d247..e996897a1c 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 13.0.11 + 13.1.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 79e8d88f08..29b52d85ca 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/benchmark/pom.xml b/benchmark/pom.xml index b79dbd5b8c..cf4c295a76 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 5d373d3f37..e3fe98e0bf 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal bundle-parent - 13.0.1 + 13.0.3 diff --git a/docs/pom.xml b/docs/pom.xml index 22c11bcb3c..618df02e59 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 13.0.11 + 13.1.2 @@ -211,9 +211,9 @@ https://netty.io/4.1/api/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.11/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/13.0.2/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/13.0.1/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.1.2/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/13.0.5/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/13.0.3/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index 6401adb5fe..a85eddfc5c 100644 --- a/features/features-controller-experimental/pom.xml +++ b/features/features-controller-experimental/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.2 diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index fb095fe8a1..aea664830d 100644 --- a/features/features-controller-testing/pom.xml +++ b/features/features-controller-testing/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.2 diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index 64d72cf7c7..5e996f7c43 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 13.1.2 diff --git a/features/pom.xml b/features/pom.xml index 97ade422e2..17ce98e76b 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/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index 556d3acd76..e8fdd6b6f5 100644 --- a/features/single-feature-parent/pom.xml +++ b/features/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 13.1.2 diff --git a/jolokia/pom.xml b/jolokia/pom.xml index 1d98663b1f..ee766e982a 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 13.0.11 + 13.1.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 56869cc048..f13690f71a 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.11 + 13.1.2 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 2b7bfeb106..3b74b875ea 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.11 + 13.1.2 @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 13.0.2 + 13.0.5 pom import org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 13.0.3 pom import diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 77e751dd0e..045c3f92c1 100644 --- 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 org.opendaylight.odlparent bundle-parent - 13.0.11 + 13.1.2 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 13.0.3 pom import diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 3ea3d8e4a0..bcae2bd008 100644 --- 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 org.opendaylight.odlparent bundle-parent - 13.0.11 + 13.1.2 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 2cd8d0ac1b..22aa0888e2 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 13.0.3 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 86f5e203f2..e3171a1df8 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 4c62912307..d6b4ded112 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 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 dcb930e8ca..2d2bd79338 100644 --- 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 future; + final ListenableFuture 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(getSender(), msg.getType()) { + Futures.addCallback(future, new AbstractCallback(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 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 2b78806ba2..7a91fa0c20 100644 --- 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 invokeAction(final Absolute type, final DOMDataTreeIdentifier path, - final ContainerNode input) { + public ListenableFuture 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 9d9e29ad36..c1cf1d5b02 100644 --- 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 { +final class RemoteDOMActionFuture extends AbstractRemoteFuture { RemoteDOMActionFuture(final @NonNull Absolute type, final @NonNull Future 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 145f86fba4..09d68d63e3 100644 --- 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 { + @java.io.Serial private static final long serialVersionUID = 1L; private final transient @NonNull ImmutableList<@NonNull RpcError> errors; - public ActionResponse(final @NonNull Optional output, @NonNull final Collection errors) { - super(output.orElse(null)); + public ActionResponse(final @Nullable ContainerNode output, @NonNull final Collection errors) { + super(output); this.errors = ImmutableList.copyOf(errors); } @@ -67,9 +67,9 @@ public class ActionResponse extends AbstractResponse { @Override public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { @SuppressWarnings("unchecked") - final ImmutableList errors = (ImmutableList) in.readObject(); - final Optional output = SerializationUtils.readNormalizedNode(in); - actionResponse = new ActionResponse(output.map(ContainerNode.class::cast), errors); + final var errors = (ImmutableList) 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 2e94f83866..1ea532b1d4 100644 --- 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 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 frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE, + final ListenableFuture 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 inputCaptor = ArgumentCaptor.forClass(ContainerNode.class); doReturn(FluentFutures.immediateFluentFuture(actionResult)).when(domActionService2).invokeAction( eq(TEST_RPC_TYPE), eq(TEST_DATA_TREE_ID), inputCaptor.capture()); - ListenableFuture frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE, + ListenableFuture 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 frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE, + final ListenableFuture 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 frontEndFuture = remoteActionImpl1.invokeAction(TEST_RPC_TYPE, + final ListenableFuture 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 495707557f..54fd55cfdf 100644 --- 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 0fc796cac8..a98403eb5b 100644 --- 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 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index b83c335a94..6af0402ecb 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 80752933e0..8f9187658d 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 diff --git a/pom.xml b/pom.xml index 7b3c5253d3..dfb329c18a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 13.1.2 -- 2.36.6