From a7b2a7b0d506ef608799959062e796e4b44e0abe Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 17 Mar 2024 09:58:35 +0100 Subject: [PATCH] Migrate Builders references We have a few easy-to-migrate references to Builders, replace them with ImmutableNodes. Change-Id: I2087f816f35c9861aebbd5c39ff82df0df355a4f Signed-off-by: Robert Varga --- .../impl/ProxyNetconfDataTreeServiceTest.java | 4 ++-- .../impl/actors/NetconfDataTreeServiceActorTest.java | 8 ++++---- .../impl/actors/ReadTransactionActorTestAdapter.java | 10 +++++----- .../impl/netconf/ProxyNetconfServiceTest.java | 4 ++-- .../impl/tx/ProxyReadWriteTransactionTest.java | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyNetconfDataTreeServiceTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyNetconfDataTreeServiceTest.java index 6b94c3c038..b5159eced5 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyNetconfDataTreeServiceTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyNetconfDataTreeServiceTest.java @@ -46,7 +46,7 @@ import org.opendaylight.yangtools.yang.common.QName; 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.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; @@ -56,7 +56,7 @@ public class ProxyNetconfDataTreeServiceTest { new RemoteDeviceId("dev1", InetSocketAddress.createUnresolved("localhost", 17830)); private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.of(); private static final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; - private static final ContainerNode NODE = Builders.containerBuilder() + private static final ContainerNode NODE = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(QName.create("", "cont"))) .build(); diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActorTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActorTest.java index c198e889ef..a9a00e0583 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActorTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActorTest.java @@ -61,14 +61,14 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder; 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.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetconfDataTreeServiceActorTest { static final YangInstanceIdentifier PATH = YangInstanceIdentifier.of(); static final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; static final Timeout TIMEOUT = Timeout.apply(5, TimeUnit.SECONDS); - static final ContainerNode NODE = Builders.containerBuilder() + static final ContainerNode NODE = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(QName.create("", "cont"))) .build(); @@ -82,9 +82,9 @@ public class NetconfDataTreeServiceActorTest { @Before public void setUp() { - this.actorRef = TestActorRef.create(system, + actorRef = TestActorRef.create(system, NetconfDataTreeServiceActor.props(netconfService, Duration.ofSeconds(2))); - this.probe = TestProbe.apply(system); + probe = TestProbe.apply(system); } @AfterClass diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java index 4c5bb36d68..750e43d414 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java @@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.common.QName; 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.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; /** * Adapter for read transaction tests. @@ -44,7 +44,7 @@ public abstract class ReadTransactionActorTestAdapter { static final YangInstanceIdentifier PATH = YangInstanceIdentifier.of(); static final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; static final Timeout TIMEOUT = Timeout.apply(5, TimeUnit.SECONDS); - static final ContainerNode NODE = Builders.containerBuilder() + static final ContainerNode NODE = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(QName.create("", "cont"))) .build(); @@ -54,9 +54,9 @@ public abstract class ReadTransactionActorTestAdapter { public void init(final DOMDataTreeReadOperations inMockReadTx, final ActorSystem system, final ActorRef inActorRef) { - this.mockReadTx = inMockReadTx; - this.probe = TestProbe.apply(system); - this.actorRef = inActorRef; + mockReadTx = inMockReadTx; + probe = TestProbe.apply(system); + actorRef = inActorRef; } @Test diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ProxyNetconfServiceTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ProxyNetconfServiceTest.java index bba72ed6f3..bd6b9b3455 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ProxyNetconfServiceTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ProxyNetconfServiceTest.java @@ -53,7 +53,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; 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.spi.node.ImmutableNodes; public class ProxyNetconfServiceTest { private static final RemoteDeviceId DEVICE_ID = @@ -68,7 +68,7 @@ public class ProxyNetconfServiceTest { @Before public void setUp() { masterActor = new TestProbe(system); - node = Builders.containerBuilder() + node = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("", "cont"))) .build(); } diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java index b958ae3eac..d72cd10681 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java @@ -50,7 +50,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; 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.spi.node.ImmutableNodes; import scala.concurrent.Promise; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; @@ -69,7 +69,7 @@ public class ProxyReadWriteTransactionTest { @Before public void setUp() { masterActor = new TestProbe(system); - node = Builders.containerBuilder() + node = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("", "cont"))) .build(); } -- 2.36.6