From daa533fe3a3e1f0257b6844b8936c29257cff39b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 22 Jan 2024 07:40:31 +0100 Subject: [PATCH] Modernize clustering-test-app Do not use deprecated constructs, for the most part at least. Change-Id: I4ca96966407129d6cb60abf2d64d718065c298ed Signed-off-by: Robert Varga --- .../controller/clustering/it/provider/CarProvider.java | 4 ++-- .../clustering/it/provider/MdsalLowLevelTestProvider.java | 4 ++-- .../clustering/it/provider/impl/IdIntsListener.java | 4 ++-- .../it/provider/impl/RoutedGetConstantService.java | 5 ++--- .../it/provider/impl/SingletonGetConstantService.java | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java index 29b77f7e93..46ffe4c626 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java @@ -103,7 +103,7 @@ public final class CarProvider { private static final String ENTITY_TYPE = "cars"; private static final InstanceIdentifier CARS_IID = InstanceIdentifier.builder(Cars.class).build(); - private static final DataTreeIdentifier CARS_DTID = DataTreeIdentifier.create( + private static final DataTreeIdentifier CARS_DTID = DataTreeIdentifier.of( LogicalDatastoreType.CONFIGURATION, CARS_IID); private final DataBroker dataProvider; @@ -292,7 +292,7 @@ public final class CarProvider { private ListenableFuture> registerLoggingDtcl( final RegisterLoggingDtclInput input) { LOG.info("Registering a new CarDataTreeChangeListener"); - final var reg = dataProvider.registerDataTreeChangeListener(CARS_DTID, new CarDataTreeChangeListener()); + final var reg = dataProvider.registerTreeChangeListener(CARS_DTID, new CarDataTreeChangeListener()); carsDtclRegistrations.add(reg); return RpcResultBuilder.success(new RegisterLoggingDtclOutputBuilder().build()).buildFuture(); } diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java index e0d6109c26..8b7fe2a113 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java @@ -278,8 +278,8 @@ public final class MdsalLowLevelTestProvider { idIntsListener = new IdIntsListener(); - dtclReg = dataTreeChangeExtension.registerDataTreeChangeListener( - new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, WriteTransactionsHandler.ID_INT_YID), + dtclReg = dataTreeChangeExtension.registerTreeChangeListener( + DOMDataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, WriteTransactionsHandler.ID_INT_YID), idIntsListener); return RpcResultBuilder.success(new SubscribeDtclOutputBuilder().build()).buildFuture(); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java index 68d7ea9a3c..70f6f78114 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java @@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public final class IdIntsListener implements ClusteredDOMDataTreeChangeListener { +public final class IdIntsListener implements DOMDataTreeChangeListener { private static final Logger LOG = LoggerFactory.getLogger(IdIntsListener.class); private static final long SECOND_AS_NANO = 1000000000; diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java index 04303a32de..c5b8a56ca6 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java @@ -24,8 +24,7 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +60,7 @@ public final class RoutedGetConstantService implements DOMRpcImplementation { public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final ContainerNode input) { LOG.debug("get-contexted-constant invoked, current value: {}", constant); - return Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder() + return Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(OUTPUT)) .withChild(ImmutableNodes.leafNode(CONSTANT, constant)) .build())); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java index 9ff4720fd6..d1d3b927c1 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java @@ -25,8 +25,7 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +65,7 @@ public final class SingletonGetConstantService implements DOMRpcImplementation, public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final ContainerNode input) { LOG.debug("get-singleton-constant invoked, current value: {}", constant); - return Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder() + return Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(OUTPUT)) .withChild(ImmutableNodes.leafNode(CONSTANT, constant)) .build())); -- 2.36.6