From e7146159921d7cfc79f2d48f1517d9ef5c37197c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 27 Jan 2024 15:53:25 +0100 Subject: [PATCH] Clean up sal-remoterpc-connector We are using a number of deprecated methods here, clean that up. Change-Id: I19b37967cd7cac472efff3ae6018ea008111c49b Signed-off-by: Robert Varga --- .../remote/rpc/messages/ExecuteAction.java | 9 +++---- .../rpc/registry/ActionRoutingTable.java | 4 +-- .../remote/rpc/registry/gossip/Gossiper.java | 21 ++++++++++------ .../RemoteActionRegistryMXBeanImpl.java | 11 +++----- .../remote/rpc/AbstractOpsTest.java | 25 ++++++++++--------- .../remote/rpc/OpsListenerTest.java | 3 +-- .../remote/rpc/OpsRegistrarTest.java | 6 ++--- .../rpc/registry/ActionRegistryTest.java | 6 ++--- 8 files changed, 40 insertions(+), 45 deletions(-) diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java index a97613542b..c462f7b5c0 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java @@ -22,7 +22,6 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput; -import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput; import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; @@ -75,10 +74,10 @@ public final class ExecuteAction extends AbstractExecute implements RemoteActionRegistryMXBean { - public RemoteActionRegistryMXBeanImpl(final BucketStoreAccess actionRegistryAccess, final Timeout timeout) { super("RemoteActionRegistry", "RemoteActionBroker", actionRegistryAccess, timeout); } @@ -33,8 +31,7 @@ public class RemoteActionRegistryMXBeanImpl extends AbstractRegistryMXBean routedAction = new HashSet<>(table.getItems().size()); for (DOMActionInstance route : table.getItems()) { - final YangInstanceIdentifier actionPath = YangInstanceIdentifier.create(new NodeIdentifier( - route.getType().lastNodeIdentifier())); + final YangInstanceIdentifier actionPath = YangInstanceIdentifier.of(route.getType().lastNodeIdentifier()); if (!actionPath.isEmpty()) { routedAction.add(ROUTE_CONSTANT + actionPath + NAME_CONSTANT + route.getType()); } @@ -84,8 +81,7 @@ public class RemoteActionRegistryMXBeanImpl extends AbstractRegistryMXBean routes = table.getItems(); Map actionMap = new HashMap<>(routes.size()); for (DOMActionInstance route : routes) { - final YangInstanceIdentifier actionPath = YangInstanceIdentifier.create(new NodeIdentifier( - route.getType().lastNodeIdentifier())); + final YangInstanceIdentifier actionPath = YangInstanceIdentifier.of(route.getType().lastNodeIdentifier()); if (!actionPath.isEmpty()) { String routeString = actionPath.toString(); if (routeString.contains(routeName)) { @@ -104,8 +100,7 @@ public class RemoteActionRegistryMXBeanImpl extends AbstractRegistryMXBean routes = table.getItems(); Map actionMap = new HashMap<>(routes.size()); for (DOMActionInstance route : routes) { - final YangInstanceIdentifier actionPath = YangInstanceIdentifier.create(new NodeIdentifier( - route.getType().lastNodeIdentifier())); + final YangInstanceIdentifier actionPath = YangInstanceIdentifier.of(route.getType().lastNodeIdentifier()); if (!actionPath.isEmpty()) { String type = route.getType().toString(); if (type.contains(name)) { diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java index 643e50e895..ac495265c5 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractOpsTest.java @@ -16,7 +16,6 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.testkit.javadsl.TestKit; import java.net.URI; -import java.util.Collection; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -36,8 +35,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -58,11 +56,10 @@ public class AbstractOpsTest { static final Absolute TEST_RPC_TYPE = Absolute.of(TEST_RPC); - static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier.create( - new YangInstanceIdentifier.NodeIdentifier(TEST_RPC)); + static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier.of(TEST_RPC); public static final DOMRpcIdentifier TEST_RPC_ID = DOMRpcIdentifier.create(TEST_RPC, TEST_PATH); - public static final DOMDataTreeIdentifier TEST_DATA_TREE_ID = new DOMDataTreeIdentifier( - LogicalDatastoreType.OPERATIONAL, TEST_PATH); + public static final DOMDataTreeIdentifier TEST_DATA_TREE_ID = + DOMDataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, TEST_PATH); static ActorSystem node1; static ActorSystem node2; @@ -142,21 +139,25 @@ public class AbstractOpsTest { } public static ContainerNode makeRPCInput(final String data) { - return Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(TEST_RPC_INPUT)) - .withChild(ImmutableNodes.leafNode(TEST_RPC_INPUT_DATA, data)).build(); + return ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(new NodeIdentifier(TEST_RPC_INPUT)) + .withChild(ImmutableNodes.leafNode(TEST_RPC_INPUT_DATA, data)) + .build(); } public static ContainerNode makeRPCOutput(final String data) { - return Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(TEST_RPC_OUTPUT)) - .withChild(ImmutableNodes.leafNode(TEST_RPC_OUTPUT, data)).build(); + return ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(new NodeIdentifier(TEST_RPC_OUTPUT)) + .withChild(ImmutableNodes.leafNode(TEST_RPC_OUTPUT, data)) + .build(); } static void assertFailedRpcResult(final DOMRpcResult rpcResult, final ErrorSeverity severity, final ErrorType errorType, final String tag, final String message, final String applicationTag, final String info, final String causeMsg) { assertNotNull("RpcResult was null", rpcResult); - final Collection rpcErrors = rpcResult.errors(); + final var rpcErrors = rpcResult.errors(); assertEquals("RpcErrors count", 1, rpcErrors.size()); assertRpcErrorEquals(rpcErrors.iterator().next(), severity, errorType, tag, message, applicationTag, info, causeMsg); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java index 5b3555594a..8c067fff46 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java @@ -28,8 +28,7 @@ public class OpsListenerTest { private static final QName TEST_QNAME = QName.create("test", "2015-06-12", "test"); private static final Absolute RPC_TYPE = Absolute.of(TEST_QNAME); - private static final YangInstanceIdentifier TEST_PATH = - YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)); + private static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier.of(TEST_QNAME); private static final DOMRpcIdentifier RPC_ID = DOMRpcIdentifier.create(TEST_QNAME, TEST_PATH); private static final DOMActionInstance ACTION_INSTANCE = DOMActionInstance.of(RPC_TYPE, LogicalDatastoreType.OPERATIONAL, TEST_PATH); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java index fae8a3e4b5..2dd529f741 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsRegistrarTest.java @@ -84,12 +84,10 @@ public class OpsRegistrarTest { final QName firstActionQName = QName.create("first:actionIdentifier", "fooAction"); final DOMActionInstance firstActionInstance = DOMActionInstance.of(Absolute.of(firstActionQName), - LogicalDatastoreType.OPERATIONAL, - YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(firstActionQName))); + LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(firstActionQName)); final DOMActionInstance secondActionInstance = DOMActionInstance.of(Absolute.of(firstActionQName), - LogicalDatastoreType.OPERATIONAL, - YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(firstActionQName))); + LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(firstActionQName)); final TestKit senderKit = new TestKit(system); firstEndpoint = new RemoteRpcEndpoint(senderKit.getRef(), Collections.singletonList(firstEndpointId)); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistryTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistryTest.java index 18e8d91ef2..7f2f096e10 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistryTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistryTest.java @@ -377,7 +377,7 @@ public class ActionRegistryTest { for (int i = 0; i < nRoutes; i++) { QName type = QName.create("/mockaction", "mockaction" + routeIdCounter++); final DOMActionInstance routeId = DOMActionInstance.of(Absolute.of(type), LogicalDatastoreType.OPERATIONAL, - YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(type))); + YangInstanceIdentifier.of(type)); added.add(routeId); //Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); @@ -412,9 +412,9 @@ public class ActionRegistryTest { private List createRouteIds() { QName type = QName.create("/mockaction", "mockaction" + routeIdCounter++); - List routeIds = new ArrayList<>(1); + var routeIds = new ArrayList(1); routeIds.add(DOMActionInstance.of(Absolute.of(type), LogicalDatastoreType.OPERATIONAL, - YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(type)))); + YangInstanceIdentifier.of(type))); return routeIds; } } -- 2.36.6