From 6c69b556e6dbcb58b5b6bfe62e9dec3f5605c398 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 22 Jan 2024 07:34:01 +0100 Subject: [PATCH] Migrate cds-access-api to ImmutableNodes Use yang-data-spi version of immutable nodes. Change-Id: Ic4052e3877caf828586f2756e6b5e555fe9ac255 Signed-off-by: Robert Varga --- opendaylight/md-sal/cds-access-api/pom.xml | 4 ++++ .../ModifyTransactionRequestBuilderTest.java | 20 +++++++++---------- .../ModifyTransactionRequestTest.java | 7 ++++--- .../commands/ReadTransactionSuccessTest.java | 6 +++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml index c3a6048fc3..d594d49a17 100644 --- a/opendaylight/md-sal/cds-access-api/pom.xml +++ b/opendaylight/md-sal/cds-access-api/pom.xml @@ -41,6 +41,10 @@ org.opendaylight.yangtools yang-data-impl + + org.opendaylight.yangtools + yang-data-spi + org.opendaylight.yangtools yang-data-codec-binfmt diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilderTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilderTest.java index 7e18f2c1d7..e424f37cf6 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilderTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilderTest.java @@ -24,11 +24,11 @@ import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; 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.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; public class ModifyTransactionRequestBuilderTest { - private final MemberName memberName = MemberName.forName("member-1"); private final FrontendType frontendType = FrontendType.forName("test"); private final FrontendIdentifier frontendId = FrontendIdentifier.create(memberName, frontendType); @@ -36,8 +36,9 @@ public class ModifyTransactionRequestBuilderTest { private final TransactionIdentifier transactionIdentifier = new TransactionIdentifier(new LocalHistoryIdentifier(clientId, 0L), 0L); private final ActorRef actorRef = ActorSystem.create("test").actorOf(Props.create(TestActors.EchoActor.class)); - private final NormalizedNode node = Builders.containerBuilder().withNodeIdentifier( - YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build(); + private final NormalizedNode node = ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create("namespace", "localName"))) + .build(); private final TransactionModification transactionModification = new TransactionWrite(YangInstanceIdentifier.of(), node); private final ModifyTransactionRequestBuilder modifyTransactionRequestBuilder = @@ -52,14 +53,14 @@ public class ModifyTransactionRequestBuilderTest { @Test public void testGetIdentifier() { - final TransactionIdentifier identifier = modifyTransactionRequestBuilder.getIdentifier(); + final var identifier = modifyTransactionRequestBuilder.getIdentifier(); assertEquals(transactionIdentifier, identifier); } @Test public void testBuildReady() { modifyTransactionRequestBuilder.setReady(); - final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); + final var modifyTransactionRequest = modifyTransactionRequestBuilder.build(); assertEquals(PersistenceProtocol.READY, modifyTransactionRequest.getPersistenceProtocol().orElseThrow()); assertEquals(transactionModification, modifyTransactionRequest.getModifications().get(0)); } @@ -67,7 +68,7 @@ public class ModifyTransactionRequestBuilderTest { @Test public void testBuildAbort() { modifyTransactionRequestBuilder.setAbort(); - final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); + final var modifyTransactionRequest = modifyTransactionRequestBuilder.build(); assertEquals(PersistenceProtocol.ABORT, modifyTransactionRequest.getPersistenceProtocol().orElseThrow()); assertTrue(modifyTransactionRequest.getModifications().isEmpty()); } @@ -75,15 +76,14 @@ public class ModifyTransactionRequestBuilderTest { @Test public void testBuildCommitTrue() { modifyTransactionRequestBuilder.setCommit(true); - final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); + final var modifyTransactionRequest = modifyTransactionRequestBuilder.build(); assertEquals(PersistenceProtocol.THREE_PHASE, modifyTransactionRequest.getPersistenceProtocol().orElseThrow()); } @Test public void testBuildCommitFalse() { modifyTransactionRequestBuilder.setCommit(false); - final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); + final var modifyTransactionRequest = modifyTransactionRequestBuilder.build(); assertEquals(PersistenceProtocol.SIMPLE, modifyTransactionRequest.getPersistenceProtocol().orElseThrow()); } - } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java index 005d5a5855..e3039d319e 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java @@ -22,11 +22,12 @@ 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; public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest { - private static final ContainerNode NODE = Builders.containerBuilder().withNodeIdentifier( - NodeIdentifier.create(QName.create("namespace", "localName"))).build(); + private static final ContainerNode NODE = ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create("namespace", "localName"))) + .build(); private static final List MODIFICATIONS = List.of( new TransactionWrite(YangInstanceIdentifier.of(), NODE)); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java index 9be6ec0118..4557897ae5 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java @@ -15,11 +15,11 @@ import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.yang.common.QName; 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; public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest { - private static final ContainerNode NODE = Builders.containerBuilder() - .withNodeIdentifier(NodeIdentifier.create(QName.create("namespace", "localName"))) + private static final ContainerNode NODE = ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create("namespace", "localName"))) .build(); private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess(TRANSACTION_IDENTIFIER, 0, -- 2.36.6