From abaef4a5ae37f27542155457fe7306a4662b1eeb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 14 Feb 2021 10:01:05 +0100 Subject: [PATCH] Bump odlparent/yangtools/mdsal Adopt latest versions, namely; - odlparent-9.0.1 - yangtools-7.0.1 - mdsal-8.0.0-SNAPSHOT There are a few adjustments needed, which mostly deal with the interface to NormalizedNode. Change-Id: I918fb885a6df62e16e17119a7e04ba1672ef7c39 Signed-off-by: Robert Varga --- akka/pom.xml | 2 +- akka/repackaged-akka-jar/pom.xml | 2 +- artifacts/pom.xml | 2 +- .../dsbenchmark/DomListBuilder.java | 5 +- .../dsbenchmark/simpletx/SimpletxDomRead.java | 6 +- .../dsbenchmark/txchain/TxchainDomRead.java | 4 +- 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 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 8 +- .../src/main/feature/feature.xml | 8 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 4 +- .../src/main/feature/feature.xml | 4 +- .../src/main/feature/feature.xml | 10 +- .../src/main/feature/feature.xml | 12 +- .../src/main/feature/feature.xml | 2 +- .../odl-toaster/src/main/feature/feature.xml | 2 +- features/pom.xml | 2 +- features/single-feature-parent/pom.xml | 2 +- jolokia/pom.xml | 2 +- karaf/pom.xml | 2 +- model/model-inventory/pom.xml | 2 +- model/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 6 +- .../blueprint/ext/BindingContext.java | 37 ++++--- .../DataStoreAppConfigDefaultXMLReader.java | 59 +++++----- .../ext/DataStoreAppConfigMetadata.java | 15 +-- .../netty-event-executor-config/pom.xml | 2 +- .../config/netty-threadgroup-config/pom.xml | 2 +- .../config/netty-timer-config/pom.xml | 2 +- opendaylight/config/pom.xml | 2 +- .../config/threadpool-config-api/pom.xml | 2 +- .../config/threadpool-config-impl/pom.xml | 2 +- .../commands/ReadTransactionSuccess.java | 6 +- .../ReadTransactionSuccessProxyV1.java | 2 +- .../commands/TransactionDataModification.java | 6 +- .../access/commands/TransactionMerge.java | 2 +- .../access/commands/TransactionWrite.java | 2 +- .../ModifyTransactionRequestBuilderTest.java | 18 +-- .../ModifyTransactionRequestTest.java | 36 +++--- .../ReadTransactionSuccessNoDataTest.java | 17 +-- .../commands/ReadTransactionSuccessTest.java | 25 +++-- opendaylight/md-sal/mdsal-it-base/pom.xml | 6 +- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../controller/cluster/raft/RaftActor.java | 2 +- .../admin/ClusterAdminRpcServiceTest.java | 48 ++++---- .../md-sal/sal-clustering-commons/pom.xml | 4 + .../node/utils/NormalizedNodeNavigator.java | 23 ++-- .../node/utils/NormalizedNodeVisitor.java | 3 +- .../node/utils/stream/SerializationUtils.java | 23 ++-- .../AbstractNormalizedNodePruner.java | 10 +- .../AbstractDataTreeModificationCursor.java | 2 +- .../cluster/io/ChunkedOutputStream.java | 8 +- .../provider/impl/RemoteSchemaProvider.java | 1 - .../utils/stream/SerializationUtilsTest.java | 22 ++-- .../transformer/NormalizedNodePrunerTest.java | 68 ++++++------ .../transformer/UintAdaptingPrunerTest.java | 2 +- .../cluster/datastore/util/TestModel.java | 12 +- .../md-sal/sal-clustering-config/pom.xml | 2 +- .../AbstractDOMBrokerWriteTransaction.java | 8 +- .../ClientBackedReadTransaction.java | 2 +- .../ClientBackedReadWriteTransaction.java | 2 +- .../ClientBackedWriteTransaction.java | 4 +- .../DOMBrokerReadOnlyTransaction.java | 8 +- .../DOMBrokerReadWriteTransaction.java | 8 +- .../actors/dds/AbstractProxyTransaction.java | 12 +- .../databroker/actors/dds/ClientSnapshot.java | 2 +- .../actors/dds/ClientTransaction.java | 6 +- .../actors/dds/LocalProxyTransaction.java | 8 +- .../dds/LocalReadOnlyProxyTransaction.java | 5 +- .../dds/LocalReadWriteProxyTransaction.java | 8 +- .../actors/dds/RemoteProxyTransaction.java | 16 +-- .../FrontendReadOnlyTransaction.java | 4 +- .../FrontendReadWriteTransaction.java | 4 +- .../datastore/LocalTransactionContext.java | 8 +- .../datastore/NoOpTransactionContext.java | 6 +- .../datastore/RemoteTransactionContext.java | 10 +- .../RootDataTreeChangeListenerActor.java | 6 +- .../cluster/datastore/ShardDataTree.java | 6 +- .../datastore/ShardRecoveryCoordinator.java | 2 +- .../cluster/datastore/TransactionContext.java | 4 +- .../TransactionModificationOperation.java | 10 +- .../cluster/datastore/TransactionProxy.java | 28 ++--- .../datastore/config/ConfigurationImpl.java | 2 +- .../config/ModuleShardConfiguration.java | 11 +- .../cluster/datastore/messages/ReadData.java | 16 +-- .../datastore/messages/ReadDataReply.java | 7 +- .../messages/UpdateSchemaContext.java | 2 +- .../modification/MergeModification.java | 6 +- .../modification/WriteModification.java | 10 +- .../AbstractDataTreeCandidateNode.java | 4 +- ...bstractVersionedShardDataTreeSnapshot.java | 9 +- .../persisted/CommitTransactionPayload.java | 4 +- .../DeletedDataTreeCandidateNode.java | 2 +- .../MetadataShardDataTreeSnapshot.java | 10 +- .../ModifiedDataTreeCandidateNode.java | 2 +- .../persisted/ShardDataTreeSnapshot.java | 2 +- .../shardstrategy/ShardStrategyFactory.java | 2 +- .../AbstractBatchedModificationsCursor.java | 5 +- .../utils/DataTreeModificationOutput.java | 6 +- .../utils/NormalizedNodeAggregator.java | 14 +-- .../utils/NormalizedNodeXMLOutput.java | 4 +- .../utils/PruningDataTreeModification.java | 29 +++-- .../ClientBackedReadTransactionTest.java | 6 +- .../ClientBackedReadWriteTransactionTest.java | 6 +- .../ClientBackedWriteTransactionTest.java | 2 +- .../actors/dds/ClientSnapshotTest.java | 3 +- .../actors/dds/ClientTransactionTest.java | 7 +- .../dds/RemoteProxyTransactionTest.java | 4 +- ...ctDistributedDataStoreIntegrationTest.java | 36 +++--- .../cluster/datastore/AbstractShardTest.java | 51 +++++---- .../AbstractTransactionProxyTest.java | 17 ++- .../DataTreeCohortIntegrationTest.java | 2 +- .../DatastoreSnapshotRestoreTest.java | 5 +- .../DistributedDataStoreIntegrationTest.java | 6 +- ...butedDataStoreRemotingIntegrationTest.java | 44 ++++---- ...reWithSegmentedJournalIntegrationTest.java | 9 +- .../cluster/datastore/IntegrationTestKit.java | 4 +- .../LocalTransactionContextTest.java | 10 +- .../ShardCommitCoordinationTest.java | 2 +- .../cluster/datastore/ShardDataTreeTest.java | 34 +++--- .../ShardRecoveryCoordinatorTest.java | 4 +- .../cluster/datastore/ShardTest.java | 36 +++--- .../datastore/ShardTransactionTest.java | 8 +- .../datastore/TransactionChainProxyTest.java | 10 +- .../datastore/TransactionProxyTest.java | 104 +++++++++--------- .../actors/ShardSnapshotActorTest.java | 6 +- .../config/ConfigurationImplBaseTest.java | 6 +- .../config/ConfigurationImplTest.java | 6 +- .../messages/BatchedModificationsTest.java | 4 +- .../datastore/messages/ReadDataReplyTest.java | 2 +- .../AbstractModificationTest.java | 5 +- .../modification/DeleteModificationTest.java | 2 +- .../modification/MergeModificationTest.java | 4 +- .../MutableCompositeModificationTest.java | 8 +- .../modification/WriteModificationTest.java | 4 +- .../CommitTransactionPayloadTest.java | 8 +- .../persisted/ShardDataTreeSnapshotTest.java | 8 +- .../persisted/ShardSnapshotStateTest.java | 2 +- .../shardmanager/ShardManagerTest.java | 8 +- .../utils/MockDataTreeChangeListener.java | 14 +-- .../utils/NormalizedNodeAggregatorTest.java | 32 +++--- .../PruningDataTreeModificationTest.java | 30 ++--- .../md/cluster/datastore/model/CarsModel.java | 18 +-- .../datastore/model/CompositeModel.java | 8 +- .../cluster/datastore/model/PeopleModel.java | 14 +-- .../md/cluster/datastore/model/TestModel.java | 24 ++-- .../AbstractEntityOwnerChangeListener.java | 3 +- .../DistributedEntityOwnershipService.java | 12 +- .../EntityOwnerChangeListener.java | 2 +- .../entityownership/EntityOwnersModel.java | 6 +- .../entityownership/EntityOwnershipShard.java | 52 ++++----- .../EntityOwnershipStatistics.java | 5 +- .../AbstractEntityOwnershipTest.java | 40 ++++--- .../CandidateListChangeListenerTest.java | 2 +- ...ributedEntityOwnershipIntegrationTest.java | 6 +- .../EntityOwnerChangeListenerTest.java | 2 +- .../EntityOwnershipStatisticsTest.java | 2 +- .../remote/rpc/RemoteRpcImplementation.java | 2 +- .../remote/rpc/messages/AbstractExecute.java | 2 +- .../remote/rpc/messages/AbstractResponse.java | 2 +- .../remote/rpc/messages/ActionResponse.java | 2 +- .../remote/rpc/messages/ExecuteRpc.java | 8 +- .../remote/rpc/messages/RpcResponse.java | 4 +- .../remote/rpc/AbstractOpsTest.java | 5 +- .../rpc/RemoteOpsImplementationTest.java | 20 ++-- .../rpc/registry/ActionRegistryTest.java | 5 +- .../remote/rpc/registry/RpcRegistryTest.java | 5 +- .../clustering-test-app/configuration/pom.xml | 2 +- .../samples/clustering-test-app/pom.xml | 2 +- .../CarEntryDataTreeCommitCohort.java | 18 ++- .../provider/MdsalLowLevelTestProvider.java | 2 +- .../it/provider/impl/GetConstantService.java | 7 +- .../it/provider/impl/IdIntsListener.java | 14 +-- .../impl/RoutedGetConstantService.java | 7 +- .../impl/SingletonGetConstantService.java | 7 +- .../impl/WriteTransactionsHandler.java | 5 +- opendaylight/md-sal/samples/pom.xml | 2 +- pom.xml | 2 +- 186 files changed, 883 insertions(+), 909 deletions(-) diff --git a/akka/pom.xml b/akka/pom.xml index 9d619cf52c..78d8357bfd 100644 --- a/akka/pom.xml +++ b/akka/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index 06bb47f9b8..143e14d12a 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 8.1.1 + 9.0.1 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 9e734e43b8..b56e4b981a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java index ad47c2ce2f..6886864378 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java @@ -16,8 +16,9 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; public final class DomListBuilder { // Inner List Qname identifiers for yang model's 'name' and 'value' @@ -44,7 +45,7 @@ public final class DomListBuilder { } private static MapNode buildInnerList(final int index, final int elements) { - CollectionNodeBuilder innerList = ImmutableNodes.mapNodeBuilder(InnerList.QNAME); + CollectionNodeBuilder innerList = ImmutableNodes.mapNodeBuilder(InnerList.QNAME); final String itemStr = "Item-" + String.valueOf(index) + "-"; for (int i = 0; i < elements; i++) { diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java index 32ae8e6336..4e9a59a744 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java @@ -62,11 +62,11 @@ public class SimpletxDomRead extends DatastoreAbstractWriter { try (DOMDataTreeReadTransaction tx = domDataBroker.newReadOnlyTransaction()) { for (int l = 0; l < outerListElem; l++) { YangInstanceIdentifier yid = pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, olId, l)); - FluentFuture>> submitFuture = tx.read(dsType, yid); + FluentFuture> submitFuture = tx.read(dsType, yid); try { - Optional> optionalDataObject = submitFuture.get(); + Optional optionalDataObject = submitFuture.get(); if (optionalDataObject != null && optionalDataObject.isPresent()) { - NormalizedNode ret = optionalDataObject.get(); + NormalizedNode ret = optionalDataObject.get(); LOG.trace("optionalDataObject is {}", ret); txOk++; } else { diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java index 4ff133db73..5c70edcd6c 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java @@ -61,8 +61,8 @@ public class TxchainDomRead extends DatastoreAbstractWriter implements DOMTransa try (DOMDataTreeReadTransaction tx = domDataBroker.newReadOnlyTransaction()) { for (int l = 0; l < outerListElem; l++) { YangInstanceIdentifier yid = pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, olId, l)); - Optional> optionalDataObject; - FluentFuture>> submitFuture = tx.read(dsType, yid); + Optional optionalDataObject; + FluentFuture> submitFuture = tx.read(dsType, yid); try { optionalDataObject = submitFuture.get(); if (optionalDataObject != null && optionalDataObject.isPresent()) { diff --git a/benchmark/pom.xml b/benchmark/pom.xml index c58390afa2..cc7ec71dc7 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 - 8.1.1 + 9.0.1 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index b2c8e431a4..7bc1df3a67 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal dom-parent - 7.0.6 + 8.0.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index e7871cfa11..8cf8f4bcb1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.1.1 + 9.0.1 @@ -226,9 +226,9 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/ https://commons.apache.org/proper/commons-codec/apidocs/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.1/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.5/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.6/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/9.0.1/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/7.0.1/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/8.0.0-SNAPSHOT/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index d0a959543f..306700e08f 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 - 8.1.1 + 9.0.1 diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index d5d0b9ed35..0d8857fe31 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 - 8.1.1 + 9.0.1 diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index bb558a7904..58156e2ed7 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.1.1 + 9.0.1 diff --git a/features/odl-clustering-test-app/src/main/feature/feature.xml b/features/odl-clustering-test-app/src/main/feature/feature.xml index 96ef65632e..7829413d47 100644 --- a/features/odl-clustering-test-app/src/main/feature/feature.xml +++ b/features/odl-clustering-test-app/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-model-rfc6991 + odl-mdsal-model-rfc6991 diff --git a/features/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml index 86adcc657d..c18573aa3a 100644 --- a/features/odl-controller-blueprint/src/main/feature/feature.xml +++ b/features/odl-controller-blueprint/src/main/feature/feature.xml @@ -8,10 +8,10 @@ --> - odl-yangtools-codec - odl-mdsal-binding-api - odl-mdsal-binding-runtime - odl-mdsal-dom-api + odl-yangtools-codec + odl-mdsal-binding-api + odl-mdsal-binding-runtime + odl-mdsal-dom-api mvn:org.opendaylight.controller/blueprint/${project.version} diff --git a/features/odl-controller-broker-local/src/main/feature/feature.xml b/features/odl-controller-broker-local/src/main/feature/feature.xml index 62cf54e3a6..9a765beb48 100644 --- a/features/odl-controller-broker-local/src/main/feature/feature.xml +++ b/features/odl-controller-broker-local/src/main/feature/feature.xml @@ -8,9 +8,9 @@ --> - odl-mdsal-dom - odl-mdsal-eos-binding - odl-mdsal-eos-dom - odl-mdsal-singleton-dom + odl-mdsal-dom + odl-mdsal-eos-binding + odl-mdsal-eos-dom + odl-mdsal-singleton-dom diff --git a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml index 70c4c6bc06..2eac124f29 100644 --- a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml +++ b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-netty-4 + odl-netty-4 diff --git a/features/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/odl-controller-mdsal-common/src/main/feature/feature.xml index 2dd5b08826..ffc34187e5 100644 --- a/features/odl-controller-mdsal-common/src/main/feature/feature.xml +++ b/features/odl-controller-mdsal-common/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-common - odl-mdsal-binding-runtime + odl-mdsal-common + odl-mdsal-binding-runtime diff --git a/features/odl-mdsal-broker/src/main/feature/feature.xml b/features/odl-mdsal-broker/src/main/feature/feature.xml index 2e38fd396f..11af9450e1 100644 --- a/features/odl-mdsal-broker/src/main/feature/feature.xml +++ b/features/odl-mdsal-broker/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-singleton-dom - odl-mdsal-eos-binding + odl-mdsal-singleton-dom + odl-mdsal-eos-binding diff --git a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml index e6ed3054a9..9a048e910a 100644 --- a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml +++ b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml @@ -8,10 +8,10 @@ --> - odl-apache-commons-lang3 - odl-dropwizard-metrics - odl-servlet-api - odl-yangtools-data - odl-yangtools-codec + odl-apache-commons-lang3 + odl-dropwizard-metrics + odl-servlet-api + odl-yangtools-data + odl-yangtools-codec diff --git a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml index 9d1375b55f..756bd7cf5f 100644 --- a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml +++ b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml @@ -8,11 +8,11 @@ --> - odl-apache-commons-text - odl-yangtools-codec - odl-mdsal-eos-dom - odl-mdsal-dom-broker - odl-mdsal-binding-dom-adapter + odl-apache-commons-text + odl-yangtools-codec + odl-mdsal-eos-dom + odl-mdsal-dom-broker + odl-mdsal-binding-dom-adapter mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf @@ -29,4 +29,4 @@ mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/cfg/datastore - \ No newline at end of file + diff --git a/features/odl-mdsal-model-inventory/src/main/feature/feature.xml b/features/odl-mdsal-model-inventory/src/main/feature/feature.xml index 0639485275..2702dbdb32 100644 --- a/features/odl-mdsal-model-inventory/src/main/feature/feature.xml +++ b/features/odl-mdsal-model-inventory/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-model-rfc6991 + odl-mdsal-model-rfc6991 diff --git a/features/odl-toaster/src/main/feature/feature.xml b/features/odl-toaster/src/main/feature/feature.xml index 6c4e82184d..07800a651b 100644 --- a/features/odl-toaster/src/main/feature/feature.xml +++ b/features/odl-toaster/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-binding-runtime + odl-mdsal-binding-runtime diff --git a/features/pom.xml b/features/pom.xml index ff8b8e1ddc..e2e799b404 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index d6c88e49f7..1690690f72 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 - 8.1.1 + 9.0.1 diff --git a/jolokia/pom.xml b/jolokia/pom.xml index b66a71b1c3..84be0c5c35 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 8.1.1 + 9.0.1 diff --git a/karaf/pom.xml b/karaf/pom.xml index b8613f84ec..0453321a04 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 8.1.1 + 9.0.1 diff --git a/model/model-inventory/pom.xml b/model/model-inventory/pom.xml index db709bef8e..379181d647 100644 --- a/model/model-inventory/pom.xml +++ b/model/model-inventory/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 7.0.6 + 8.0.0-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index 878256e631..9c51951084 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 923d79d643..5b4cb45ec2 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 8.1.1 + 9.0.1 @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.5 + 7.0.1 pom import org.opendaylight.mdsal mdsal-artifacts - 7.0.6 + 8.0.0-SNAPSHOT pom import diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java index e519857aae..dd672e4110 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java @@ -7,12 +7,14 @@ */ package org.opendaylight.controller.blueprint.ext; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; + import com.google.common.base.Strings; +import com.google.common.collect.Iterables; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; -import java.util.List; +import java.util.Set; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; @@ -32,8 +34,10 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; +import org.opendaylight.yangtools.yang.model.api.SchemaTreeInference; +import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.w3c.dom.Element; import org.xml.sax.SAXException; @@ -84,25 +88,24 @@ public abstract class BindingContext { bindingQName = BindingReflections.findQName(appConfigBindingClass); } - public NormalizedNode parseDataElement(final Element element, final DataSchemaNode dataSchema, - final EffectiveModelContext schemaContext) throws XMLStreamException, IOException, - ParserConfigurationException, SAXException, URISyntaxException { + public NormalizedNode parseDataElement(final Element element, final SchemaTreeInference dataSchema) + throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); - final XmlParserStream xmlParser = XmlParserStream.create(writer, schemaContext, dataSchema); + final XmlParserStream xmlParser = XmlParserStream.create(writer, dataSchema); xmlParser.traverse(new DOMSource(element)); - final NormalizedNode result = resultHolder.getResult(); + final NormalizedNode result = resultHolder.getResult(); if (result instanceof MapNode) { final MapNode mapNode = (MapNode) result; - final MapEntryNode mapEntryNode = mapNode.getValue().iterator().next(); + final MapEntryNode mapEntryNode = mapNode.body().iterator().next(); return mapEntryNode; } return result; } - public abstract NormalizedNode newDefaultNode(DataSchemaNode dataSchema); + public abstract NormalizedNode newDefaultNode(SchemaTreeInference dataSchema); /** * BindingContext implementation for a container binding. @@ -115,7 +118,7 @@ public abstract class BindingContext { } @Override - public NormalizedNode newDefaultNode(final DataSchemaNode dataSchema) { + public NormalizedNode newDefaultNode(final SchemaTreeInference dataSchema) { return ImmutableNodes.containerNode(bindingQName); } } @@ -146,11 +149,15 @@ public abstract class BindingContext { } @Override - public NormalizedNode newDefaultNode(final DataSchemaNode dataSchema) { + public NormalizedNode newDefaultNode(final SchemaTreeInference dataSchema) { + final SchemaTreeEffectiveStatement stmt = Iterables.getLast(dataSchema.statementPath()); + // We assume there's only one key for the list. - List keys = ((ListSchemaNode)dataSchema).getKeyDefinition(); - Preconditions.checkArgument(keys.size() == 1, "Expected only 1 key for list %s", appConfigBindingClass); - QName listKeyQName = keys.get(0); + final Set keys = stmt.findFirstEffectiveSubstatementArgument(KeyEffectiveStatement.class) + .orElseThrow(); + + checkArgument(keys.size() == 1, "Expected only 1 key for list %s", appConfigBindingClass); + QName listKeyQName = keys.iterator().next(); return ImmutableNodes.mapEntryBuilder(bindingQName, listKeyQName, appConfigListKeyValue).build(); } } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java index 6f323716ee..c147492955 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java @@ -20,13 +20,13 @@ import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSeriali import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.SchemaTreeInference; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -53,8 +53,8 @@ public class DataStoreAppConfigDefaultXMLReader { @FunctionalInterface public interface FallbackConfigProvider { - NormalizedNode get(EffectiveModelContext schemaContext, DataSchemaNode dataSchema) throws IOException, - XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; + NormalizedNode get(SchemaTreeInference dataSchema) + throws IOException, XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; } @FunctionalInterface @@ -95,9 +95,9 @@ public class DataStoreAppConfigDefaultXMLReader { public T createDefaultInstance() throws ConfigXMLReaderException, ParserConfigurationException, XMLStreamException, IOException, SAXException, URISyntaxException { - return createDefaultInstance((schemaContext, dataSchema) -> { - throw new IllegalArgumentException("Failed to read XML " - + "(not creating model from defaults as runtime would, for better clarity in tests)"); + return createDefaultInstance(dataSchema -> { + throw new IllegalArgumentException( + "Failed to read XML (not creating model from defaults as runtime would, for better clarity in tests)"); }); } @@ -117,19 +117,22 @@ public class DataStoreAppConfigDefaultXMLReader { checkNotNull(module, "%s: Could not obtain the module schema for namespace %s, revision %s", logName, bindingContext.bindingQName.getNamespace(), bindingContext.bindingQName.getRevision()); - QName qname = bindingContext.bindingQName; - DataSchemaNode dataSchema = module.findDataChildByName(qname).orElseThrow( - () -> new ConfigXMLReaderException(logName + ": Could not obtain the schema for " + qname)); - - checkNotNull(dataSchema, "%s: Could not obtain the schema for %s", logName, bindingContext.bindingQName); + final SchemaInferenceStack schemaStack = SchemaInferenceStack.of(schemaContext); + final SchemaTreeEffectiveStatement dataSchema; + try { + dataSchema = schemaStack.enterSchemaTree(bindingContext.bindingQName); + } catch (IllegalArgumentException e) { + throw new ConfigXMLReaderException( + logName + ": Could not obtain the schema for " + bindingContext.bindingQName, e); + } - checkCondition(bindingContext.schemaType.isAssignableFrom(dataSchema.getClass()), + checkCondition(bindingContext.schemaType.isInstance(dataSchema), "%s: Expected schema type %s for %s but actual type is %s", logName, bindingContext.schemaType, bindingContext.bindingQName, dataSchema.getClass()); - NormalizedNode dataNode = parsePossibleDefaultAppConfigXMLFile(schemaContext, dataSchema); + NormalizedNode dataNode = parsePossibleDefaultAppConfigXMLFile(schemaStack); if (dataNode == null) { - dataNode = fallback.get(schemaService.getGlobalContext(), dataSchema); + dataNode = fallback.get(schemaStack.toSchemaTreeInference()); } DataObject appConfig = bindingSerializer.fromNormalizedNode(yangPath, dataNode).getValue(); @@ -153,12 +156,12 @@ public class DataStoreAppConfigDefaultXMLReader { } } - private NormalizedNode parsePossibleDefaultAppConfigXMLFile(final EffectiveModelContext schemaContext, - final DataSchemaNode dataSchema) throws ConfigXMLReaderException { - + private NormalizedNode parsePossibleDefaultAppConfigXMLFile(final SchemaInferenceStack schemaStack) + throws ConfigXMLReaderException { String appConfigFileName = defaultAppConfigFileName; if (Strings.isNullOrEmpty(appConfigFileName)) { - String moduleName = findYangModuleName(bindingContext.bindingQName, schemaContext); + String moduleName = schemaStack.currentModule().argument().getLocalName(); + appConfigFileName = moduleName + "_" + bindingContext.bindingQName.getLocalName() + ".xml"; } @@ -176,8 +179,8 @@ public class DataStoreAppConfigDefaultXMLReader { URL url = optionalURL.get(); try (InputStream is = url.openStream()) { Document root = UntrustedXML.newDocumentBuilder().parse(is); - NormalizedNode dataNode = bindingContext.parseDataElement(root.getDocumentElement(), dataSchema, - schemaContext); + NormalizedNode dataNode = bindingContext.parseDataElement(root.getDocumentElement(), + schemaStack.toSchemaTreeInference()); LOG.debug("{}: Parsed data node: {}", logName, dataNode); @@ -189,16 +192,4 @@ public class DataStoreAppConfigDefaultXMLReader { throw new ConfigXMLReaderException(msg, e); } } - - private String findYangModuleName(final QName qname, final SchemaContext schemaContext) - throws ConfigXMLReaderException { - for (Module m : schemaContext.getModules()) { - if (qname.getModule().equals(m.getQNameModule())) { - return m.getName(); - } - } - throw new ConfigXMLReaderException( - String.format("%s: Could not find yang module for QName %s", logName, qname)); - } - } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java index 0d3880e0a2..5b20827c7f 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java @@ -36,8 +36,7 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.SchemaTreeInference; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -257,9 +256,9 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor DataStoreAppConfigDefaultXMLReader reader = new DataStoreAppConfigDefaultXMLReader<>(logName(), defaultAppConfigFileName, getOSGiService(DOMSchemaService.class), bindingSerializer, bindingContext, inputStreamProvider); - return reader.createDefaultInstance((schemaContext, dataSchema) -> { + return reader.createDefaultInstance(dataSchema -> { // Fallback if file cannot be read, try XML from Config - NormalizedNode dataNode = parsePossibleDefaultAppConfigElement(schemaContext, dataSchema); + NormalizedNode dataNode = parsePossibleDefaultAppConfigElement(dataSchema); if (dataNode == null) { // or, as last resort, defaults from the model return bindingContext.newDefaultNode(dataSchema); @@ -279,9 +278,8 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor } } - private @Nullable NormalizedNode parsePossibleDefaultAppConfigElement( - final EffectiveModelContext schemaContext, final DataSchemaNode dataSchema) throws URISyntaxException, - IOException, ParserConfigurationException, SAXException, XMLStreamException { + private @Nullable NormalizedNode parsePossibleDefaultAppConfigElement(final SchemaTreeInference dataSchema) + throws URISyntaxException, IOException, ParserConfigurationException, SAXException, XMLStreamException { if (defaultAppConfigElement == null) { return null; } @@ -290,8 +288,7 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor LOG.debug("{}: Got app config schema: {}", logName(), dataSchema); - NormalizedNode dataNode = bindingContext.parseDataElement(defaultAppConfigElement, dataSchema, - schemaContext); + NormalizedNode dataNode = bindingContext.parseDataElement(defaultAppConfigElement, dataSchema); LOG.debug("{}: Parsed data node: {}", logName(), dataNode); diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index 20ea6601e5..ebe4bcc053 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.1.1 + 9.0.1 diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index fdb58f2da0..186eac30bc 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.1.1 + 9.0.1 diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index d6a3e2de8e..7b96b6a3f8 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.1.1 + 9.0.1 diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index d05c389988..be8c502416 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index edac7f10e6..226b75047d 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.1.1 + 9.0.1 diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index c8c08948bb..000c6ae32c 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.1.1 + 9.0.1 diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java index 5283257061..1b3410ee3c 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java @@ -28,15 +28,15 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public final class ReadTransactionSuccess extends TransactionSuccess implements SliceableMessage { private static final long serialVersionUID = 1L; - private final Optional> data; + private final Optional data; public ReadTransactionSuccess(final TransactionIdentifier identifier, final long sequence, - final Optional> data) { + final Optional data) { super(identifier, sequence); this.data = requireNonNull(data); } - public Optional> getData() { + public Optional getData() { return data; } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessProxyV1.java index 357c3d977c..d442f36739 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessProxyV1.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessProxyV1.java @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVer final class ReadTransactionSuccessProxyV1 extends AbstractTransactionSuccessProxy { private static final long serialVersionUID = 1L; - private Optional> data; + private Optional data; private transient NormalizedNodeStreamVersion streamVersion; // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java index eb2b3082c6..9f0cb81876 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java @@ -22,14 +22,14 @@ import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutpu */ @Beta public abstract class TransactionDataModification extends TransactionModification { - private final NormalizedNode data; + private final NormalizedNode data; - TransactionDataModification(final YangInstanceIdentifier path, final NormalizedNode data) { + TransactionDataModification(final YangInstanceIdentifier path, final NormalizedNode data) { super(path); this.data = requireNonNull(data); } - public final NormalizedNode getData() { + public final NormalizedNode getData() { return data; } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionMerge.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionMerge.java index 1d9bffd346..bf2580f44b 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionMerge.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionMerge.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ @Beta public final class TransactionMerge extends TransactionDataModification { - public TransactionMerge(final YangInstanceIdentifier path, final NormalizedNode data) { + public TransactionMerge(final YangInstanceIdentifier path, final NormalizedNode data) { super(path, data); } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionWrite.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionWrite.java index b46cf38882..4960c4ad98 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionWrite.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionWrite.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ @Beta public final class TransactionWrite extends TransactionDataModification { - public TransactionWrite(final YangInstanceIdentifier path, final NormalizedNode data) { + public TransactionWrite(final YangInstanceIdentifier path, final NormalizedNode data) { super(path, data); } 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 f7f88ed022..5f6f6454ce 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 @@ -8,12 +8,12 @@ package org.opendaylight.controller.cluster.access.commands; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Props; import akka.testkit.TestActors; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; @@ -36,7 +36,7 @@ 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( + private final NormalizedNode node = Builders.containerBuilder().withNodeIdentifier( YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build(); private final TransactionModification transactionModification = new TransactionWrite(YangInstanceIdentifier.empty(), node); @@ -53,37 +53,37 @@ public class ModifyTransactionRequestBuilderTest { @Test public void testGetIdentifier() { final TransactionIdentifier identifier = modifyTransactionRequestBuilder.getIdentifier(); - Assert.assertEquals(transactionIdentifier, identifier); + assertEquals(transactionIdentifier, identifier); } @Test public void testBuildReady() { modifyTransactionRequestBuilder.setReady(); final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); - Assert.assertEquals(PersistenceProtocol.READY, modifyTransactionRequest.getPersistenceProtocol().get()); - Assert.assertEquals(transactionModification, modifyTransactionRequest.getModifications().get(0)); + assertEquals(PersistenceProtocol.READY, modifyTransactionRequest.getPersistenceProtocol().get()); + assertEquals(transactionModification, modifyTransactionRequest.getModifications().get(0)); } @Test public void testBuildAbort() { modifyTransactionRequestBuilder.setAbort(); final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); - Assert.assertEquals(PersistenceProtocol.ABORT, modifyTransactionRequest.getPersistenceProtocol().get()); - Assert.assertTrue(modifyTransactionRequest.getModifications().isEmpty()); + assertEquals(PersistenceProtocol.ABORT, modifyTransactionRequest.getPersistenceProtocol().get()); + assertTrue(modifyTransactionRequest.getModifications().isEmpty()); } @Test public void testBuildCommitTrue() { modifyTransactionRequestBuilder.setCommit(true); final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); - Assert.assertEquals(PersistenceProtocol.THREE_PHASE, modifyTransactionRequest.getPersistenceProtocol().get()); + assertEquals(PersistenceProtocol.THREE_PHASE, modifyTransactionRequest.getPersistenceProtocol().get()); } @Test public void testBuildCommitFalse() { modifyTransactionRequestBuilder.setCommit(false); final ModifyTransactionRequest modifyTransactionRequest = modifyTransactionRequestBuilder.build(); - Assert.assertEquals(PersistenceProtocol.SIMPLE, modifyTransactionRequest.getPersistenceProtocol().get()); + assertEquals(PersistenceProtocol.SIMPLE, modifyTransactionRequest.getPersistenceProtocol().get()); } } 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 d0e8401d98..7d0164f867 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 @@ -7,6 +7,9 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.opendaylight.controller.cluster.access.commands.TransactionModification.TYPE_WRITE; import com.google.common.base.MoreObjects; @@ -18,12 +21,13 @@ import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +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; public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest { - private static final NormalizedNode NODE = Builders.containerBuilder().withNodeIdentifier( - YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build(); + private static final ContainerNode NODE = Builders.containerBuilder().withNodeIdentifier( + NodeIdentifier.create(QName.create("namespace", "localName"))).build(); private static final List MODIFICATIONS = Lists.newArrayList( new TransactionWrite(YangInstanceIdentifier.empty(), NODE)); @@ -41,22 +45,22 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest @Test public void getPersistenceProtocolTest() { final Optional result = OBJECT.getPersistenceProtocol(); - Assert.assertTrue(result.isPresent()); - Assert.assertEquals(PROTOCOL, result.get()); + assertTrue(result.isPresent()); + assertEquals(PROTOCOL, result.get()); } @Test public void getModificationsTest() { final List result = OBJECT.getModifications(); - Assert.assertNotNull(result); - Assert.assertEquals(MODIFICATIONS, result); + assertNotNull(result); + assertEquals(MODIFICATIONS, result); } @Test public void addToStringAttributesTest() { final MoreObjects.ToStringHelper result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)); - Assert.assertTrue(result.toString().contains("modifications=1")); - Assert.assertTrue(result.toString().contains("protocol=" + PROTOCOL)); + assertTrue(result.toString().contains("modifications=1")); + assertTrue(result.toString().contains("protocol=" + PROTOCOL)); } @Test @@ -67,16 +71,16 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest @Override protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof ModifyTransactionRequest); + assertTrue(deserialize instanceof ModifyTransactionRequest); final ModifyTransactionRequest casted = (ModifyTransactionRequest) deserialize; - Assert.assertEquals(OBJECT.getReplyTo(), casted.getReplyTo()); - Assert.assertEquals(OBJECT.getPersistenceProtocol(), casted.getPersistenceProtocol()); + assertEquals(OBJECT.getReplyTo(), casted.getReplyTo()); + assertEquals(OBJECT.getPersistenceProtocol(), casted.getPersistenceProtocol()); - Assert.assertNotNull(casted.getModifications()); - Assert.assertEquals(1, casted.getModifications().size()); + assertNotNull(casted.getModifications()); + assertEquals(1, casted.getModifications().size()); final TransactionModification modification = casted.getModifications().get(0); - Assert.assertEquals(YangInstanceIdentifier.empty(), modification.getPath()); - Assert.assertEquals(TYPE_WRITE, modification.getType()); + assertEquals(YangInstanceIdentifier.empty(), modification.getPath()); + assertEquals(TYPE_WRITE, modification.getType()); } } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java index 0a56e822a3..51257462b6 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java @@ -7,8 +7,11 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.Optional; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -24,19 +27,19 @@ public class ReadTransactionSuccessNoDataTest extends AbstractTransactionSuccess @Test public void getDataTest() { - final Optional> result = OBJECT.getData(); - Assert.assertFalse(result.isPresent()); + final Optional result = OBJECT.getData(); + assertFalse(result.isPresent()); } @Test public void cloneAsVersionTest() { final ReadTransactionSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, clone); } @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof ReadTransactionSuccess); - Assert.assertEquals(OBJECT.getData(), ((ReadTransactionSuccess) deserialize).getData()); + protected void doAdditionalAssertions(final Object deserialize) { + assertTrue(deserialize instanceof ReadTransactionSuccess); + assertEquals(OBJECT.getData(), ((ReadTransactionSuccess) deserialize).getData()); } } 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 a50dc5d50c..4bda8c8016 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 @@ -7,18 +7,21 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Optional; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; 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.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest { - private static final NormalizedNode NODE = Builders.containerBuilder().withNodeIdentifier( - YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build(); + private static final ContainerNode NODE = Builders.containerBuilder().withNodeIdentifier( + NodeIdentifier.create(QName.create("namespace", "localName"))).build(); private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess( TRANSACTION_IDENTIFIER, 0, Optional.of(NODE)); @@ -30,20 +33,20 @@ public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest> result = OBJECT.getData(); - Assert.assertTrue(result.isPresent()); - Assert.assertEquals(NODE.getValue(), result.get().getValue()); + final Optional result = OBJECT.getData(); + assertTrue(result.isPresent()); + assertEquals(NODE.body(), result.get().body()); } @Test public void cloneAsVersionTest() { final ReadTransactionSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, clone); } @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof ReadTransactionSuccess); - Assert.assertEquals(OBJECT.getData(), ((ReadTransactionSuccess) deserialize).getData()); + protected void doAdditionalAssertions(final Object deserialize) { + assertTrue(deserialize instanceof ReadTransactionSuccess); + assertEquals(OBJECT.getData(), ((ReadTransactionSuccess) deserialize).getData()); } } diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 6a5374b515..75a993d380 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 - 8.1.1 + 9.0.1 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 7.0.6 + 8.0.0-SNAPSHOT pom import @@ -93,13 +93,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.geronimo.specs geronimo-atinject_1.0_spec - 1.0 org.apache.karaf.features org.apache.karaf.features.core - ${karaf.version} compile diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 0d509bd6a0..46e5e53fb4 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 - 8.1.1 + 9.0.1 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 830d01a049..0bf9d7cf71 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 7.0.6 + 8.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 0f3ad47769..23c93cfa5c 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index 3bedc59113..00f6a04346 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -213,7 +213,7 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { * Handles a message. * * @deprecated This method is not final for testing purposes. DO NOT OVERRIDE IT, override - * {@link #handleNonRaftCommand(Object)} instead. + * {@link #handleNonRaftCommand(Object)} instead. */ @Deprecated @Override diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java index 1362db752e..f90a428c03 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java +++ b/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java @@ -26,18 +26,13 @@ import akka.actor.ActorRef; import akka.actor.PoisonPill; import akka.actor.Status.Success; import akka.cluster.Cluster; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.File; import java.io.FileInputStream; -import java.net.URI; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -95,6 +90,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.shard.result.output.ShardResultKey; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** @@ -173,7 +169,7 @@ public class ClusterAdminRpcServiceTest { shardNames.add(s.getName()); } - assertEquals("DatastoreSnapshot shard names", Sets.newHashSet(expShardNames), shardNames); + assertEquals("DatastoreSnapshot shard names", Set.of(expShardNames), shardNames); } @Test @@ -254,7 +250,7 @@ public class ClusterAdminRpcServiceTest { verifyRaftPeersPresent(newReplicaNode2.operDataStore(), "cars", "member-1", "member-3"); // Write data to member-2's config datastore and read/verify via member-3 - final NormalizedNode configCarsNode = writeCarsNodeAndVerify(newReplicaNode2.configDataStore(), + final NormalizedNode configCarsNode = writeCarsNodeAndVerify(newReplicaNode2.configDataStore(), newReplicaNode3.configDataStore()); // Write data to member-3's oper datastore and read/verify via member-2 @@ -311,10 +307,10 @@ public class ClusterAdminRpcServiceTest { verifyFailedRpcResult(rpcResult); } - private static NormalizedNode writeCarsNodeAndVerify(final AbstractDataStore writeToStore, + private static NormalizedNode writeCarsNodeAndVerify(final AbstractDataStore writeToStore, final AbstractDataStore readFromStore) throws Exception { DOMStoreWriteTransaction writeTx = writeToStore.newWriteOnlyTransaction(); - NormalizedNode carsNode = CarsModel.create(); + NormalizedNode carsNode = CarsModel.create(); writeTx.write(CarsModel.BASE_PATH, carsNode); DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); @@ -328,8 +324,8 @@ public class ClusterAdminRpcServiceTest { } private static void readCarsNodeAndVerify(final AbstractDataStore readFromStore, - final NormalizedNode expCarsNode) throws Exception { - Optional> optional = readFromStore.newReadOnlyTransaction().read(CarsModel.BASE_PATH) + final NormalizedNode expCarsNode) throws Exception { + Optional optional = readFromStore.newReadOnlyTransaction().read(CarsModel.BASE_PATH) .get(15, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", expCarsNode, optional.get()); @@ -501,9 +497,8 @@ public class ClusterAdminRpcServiceTest { MemberNode leaderNode1 = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) .moduleShardsConfig(moduleShardsConfig).waitForShardLeader("cars", "people").build(); - ModuleShardConfiguration petsModuleConfig = new ModuleShardConfiguration(URI.create("pets-ns"), "pets-module", - "pets", null, - Collections.singletonList(MEMBER_1)); + ModuleShardConfiguration petsModuleConfig = new ModuleShardConfiguration( + XMLNamespace.of("pets-ns"), "pets-module", "pets", null, List.of(MEMBER_1)); leaderNode1.configDataStore().getActorUtils().getShardManager().tell( new CreateShard(petsModuleConfig, Shard.builder(), null), leaderNode1.kit().getRef()); leaderNode1.kit().expectMsgClass(Success.class); @@ -520,9 +515,8 @@ public class ClusterAdminRpcServiceTest { newReplicaNode2.kit().expectMsgClass(Success.class); newReplicaNode2.operDataStore().getActorUtils().getShardManager().tell( - new CreateShard(new ModuleShardConfiguration(URI.create("no-leader-ns"), "no-leader-module", - "no-leader", null, - Collections.singletonList(MEMBER_1)), + new CreateShard(new ModuleShardConfiguration(XMLNamespace.of("no-leader-ns"), "no-leader-module", + "no-leader", null, List.of(MEMBER_1)), Shard.builder(), null), newReplicaNode2.kit().getRef()); newReplicaNode2.kit().expectMsgClass(Success.class); @@ -567,8 +561,8 @@ public class ClusterAdminRpcServiceTest { verifyRaftPeersPresent(replicaNode2.configDataStore(), "cars", "member-1", "member-3"); verifyRaftPeersPresent(replicaNode3.configDataStore(), "cars", "member-1", "member-2"); - ModuleShardConfiguration petsModuleConfig = new ModuleShardConfiguration(URI.create("pets-ns"), "pets-module", - "pets", null, Arrays.asList(MEMBER_1, MEMBER_2, MEMBER_3)); + ModuleShardConfiguration petsModuleConfig = new ModuleShardConfiguration(XMLNamespace.of("pets-ns"), + "pets-module", "pets", null, List.of(MEMBER_1, MEMBER_2, MEMBER_3)); leaderNode1.configDataStore().getActorUtils().getShardManager().tell( new CreateShard(petsModuleConfig, Shard.builder(), null), leaderNode1.kit().getRef()); leaderNode1.kit().expectMsgClass(Success.class); @@ -637,7 +631,7 @@ public class ClusterAdminRpcServiceTest { RpcResult rpcResult = service3 .changeMemberVotingStatesForShard(new ChangeMemberVotingStatesForShardInputBuilder() .setShardName("cars").setDataStoreType(DataStoreType.Config) - .setMemberVotingState(ImmutableList.of( + .setMemberVotingState(List.of( new MemberVotingStateBuilder().setMemberName("member-2").setVoting(FALSE).build(), new MemberVotingStateBuilder().setMemberName("member-3").setVoting(FALSE).build())) .build()) @@ -671,8 +665,10 @@ public class ClusterAdminRpcServiceTest { RpcResult rpcResult = service .changeMemberVotingStatesForShard(new ChangeMemberVotingStatesForShardInputBuilder() .setShardName("cars").setDataStoreType(DataStoreType.Config) - .setMemberVotingState(ImmutableList - .of(new MemberVotingStateBuilder().setMemberName("member-1").setVoting(FALSE).build())) + .setMemberVotingState(List.of(new MemberVotingStateBuilder() + .setMemberName("member-1") + .setVoting(FALSE) + .build())) .build()) .get(10, TimeUnit.SECONDS); verifyFailedRpcResult(rpcResult); @@ -709,7 +705,7 @@ public class ClusterAdminRpcServiceTest { replicaNode3.operDataStore(), null); RpcResult rpcResult = service3.changeMemberVotingStatesForAllShards( - new ChangeMemberVotingStatesForAllShardsInputBuilder().setMemberVotingState(ImmutableList.of( + new ChangeMemberVotingStatesForAllShardsInputBuilder().setMemberVotingState(List.of( new MemberVotingStateBuilder().setMemberName("member-2").setVoting(FALSE).build(), new MemberVotingStateBuilder().setMemberName("member-3").setVoting(FALSE).build())).build()) .get(10, TimeUnit.SECONDS); @@ -730,7 +726,7 @@ public class ClusterAdminRpcServiceTest { public void testFlipMemberVotingStates() throws Exception { String name = "testFlipMemberVotingStates"; - ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(Arrays.asList( + ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(List.of( new ServerInfo("member-1", true), new ServerInfo("member-2", true), new ServerInfo("member-3", false))); @@ -819,7 +815,7 @@ public class ClusterAdminRpcServiceTest { // Members 1, 2, and 3 are initially started up as non-voting. Members 4, 5, and 6 are initially // non-voting and simulated as down by not starting them up. - ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(Arrays.asList( + ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(List.of( new ServerInfo("member-1", false), new ServerInfo("member-2", false), new ServerInfo("member-3", false), new ServerInfo("member-4", true), new ServerInfo("member-5", true), new ServerInfo("member-6", true))); @@ -891,7 +887,7 @@ public class ClusterAdminRpcServiceTest { String name = "testFlipMemberVotingStatesWithVotingMembersDown"; // Members 4, 5, and 6 are initially non-voting and simulated as down by not starting them up. - ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(Arrays.asList( + ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(List.of( new ServerInfo("member-1", true), new ServerInfo("member-2", true), new ServerInfo("member-3", true), new ServerInfo("member-4", false), new ServerInfo("member-5", false), new ServerInfo("member-6", false))); diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index 860af701c3..24f53d1aca 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -141,6 +141,10 @@ org.opendaylight.yangtools yang-data-codec-binfmt + + org.opendaylight.yangtools + yang-repo-spi + diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java index 0bf1a2fe01..6e567fa245 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java @@ -18,14 +18,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; * NormalizedNodeNavigator walks a {@link NormalizedNodeVisitor} through the NormalizedNode. */ public class NormalizedNodeNavigator { - private final NormalizedNodeVisitor visitor; public NormalizedNodeNavigator(final NormalizedNodeVisitor visitor) { this.visitor = requireNonNull(visitor, "visitor should not be null"); } - public void navigate(String parentPath, final NormalizedNode normalizedNode) { + public void navigate(String parentPath, final NormalizedNode normalizedNode) { if (parentPath == null) { parentPath = ""; } @@ -33,14 +32,14 @@ public class NormalizedNodeNavigator { } private void navigateDataContainerNode(final int level, final String parentPath, - final DataContainerNode dataContainerNode) { + final DataContainerNode dataContainerNode) { visitor.visitNode(level, parentPath, dataContainerNode); String newParentPath = parentPath + "/" + dataContainerNode.getIdentifier().toString(); - for (NormalizedNode node : dataContainerNode.getValue()) { + for (NormalizedNode node : dataContainerNode.body()) { if (node instanceof MixinNode && node instanceof NormalizedNodeContainer) { - navigateNormalizedNodeContainerMixin(level, newParentPath, (NormalizedNodeContainer) node); + navigateNormalizedNodeContainerMixin(level, newParentPath, (NormalizedNodeContainer) node); } else { navigateNormalizedNode(level, newParentPath, node); } @@ -49,15 +48,15 @@ public class NormalizedNodeNavigator { } private void navigateNormalizedNodeContainerMixin(final int level, final String parentPath, - final NormalizedNodeContainer node) { + final NormalizedNodeContainer node) { visitor.visitNode(level, parentPath, node); String newParentPath = parentPath + "/" + node.getIdentifier().toString(); - for (NormalizedNode normalizedNode : node.getValue()) { + for (NormalizedNode normalizedNode : node.body()) { if (normalizedNode instanceof MixinNode && normalizedNode instanceof NormalizedNodeContainer) { navigateNormalizedNodeContainerMixin(level + 1, newParentPath, - (NormalizedNodeContainer) normalizedNode); + (NormalizedNodeContainer) normalizedNode); } else { navigateNormalizedNode(level, newParentPath, normalizedNode); } @@ -65,13 +64,9 @@ public class NormalizedNodeNavigator { } - private void navigateNormalizedNode(final int level, final String parentPath, - final NormalizedNode normalizedNode) { + private void navigateNormalizedNode(final int level, final String parentPath, final NormalizedNode normalizedNode) { if (normalizedNode instanceof DataContainerNode) { - - final DataContainerNode dataContainerNode = (DataContainerNode) normalizedNode; - - navigateDataContainerNode(level + 1, parentPath, dataContainerNode); + navigateDataContainerNode(level + 1, parentPath, (DataContainerNode) normalizedNode); } else { visitor.visitNode(level + 1, parentPath, normalizedNode); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java index c04f0ced5f..d455c41754 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore.node.utils; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public interface NormalizedNodeVisitor { - void visitNode(int level, String parentPath, NormalizedNode normalizedNode); + void visitNode(int level, String parentPath, NormalizedNode normalizedNode); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java index fcafccd817..a2c456d17a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java @@ -33,24 +33,23 @@ public final class SerializationUtils { @FunctionalInterface public interface Applier { - void apply(T instance, YangInstanceIdentifier path, NormalizedNode node); + void apply(T instance, YangInstanceIdentifier path, NormalizedNode node); } - public static Optional> readNormalizedNode(final DataInput in) throws IOException { + public static Optional readNormalizedNode(final DataInput in) throws IOException { if (!in.readBoolean()) { return Optional.empty(); } return Optional.of(NormalizedNodeDataInput.newDataInput(in).readNormalizedNode()); } - public static void writeNormalizedNode(final DataOutput out, final @Nullable NormalizedNode node) + public static void writeNormalizedNode(final DataOutput out, final @Nullable NormalizedNode node) throws IOException { writeNormalizedNode(out, MAGNESIUM, node); } - public static void writeNormalizedNode(final DataOutput out, - final org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion version, - final @Nullable NormalizedNode node) throws IOException { + public static void writeNormalizedNode(final DataOutput out, final NormalizedNodeStreamVersion version, + final @Nullable NormalizedNode node) throws IOException { if (node != null) { out.writeBoolean(true); @@ -81,13 +80,13 @@ public final class SerializationUtils { public static void readNodeAndPath(final DataInput in, final T instance, final Applier applier) throws IOException { final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in); - NormalizedNode node = stream.readNormalizedNode(); + NormalizedNode node = stream.readNormalizedNode(); YangInstanceIdentifier path = stream.readYangInstanceIdentifier(); applier.apply(instance, path, node); } public static void writeNodeAndPath(final DataOutput out, final NormalizedNodeStreamVersion version, - final YangInstanceIdentifier path, final NormalizedNode node) throws IOException { + final YangInstanceIdentifier path, final NormalizedNode node) throws IOException { try (NormalizedNodeDataOutput stream = version.newDataOutput(out)) { stream.writeNormalizedNode(node); stream.writeYangInstanceIdentifier(path); @@ -95,7 +94,7 @@ public final class SerializationUtils { } public static void writeNodeAndPath(final DataOutput out, final YangInstanceIdentifier path, - final NormalizedNode node) throws IOException { + final NormalizedNode node) throws IOException { writeNodeAndPath(out, MAGNESIUM, path, node); } @@ -103,13 +102,13 @@ public final class SerializationUtils { throws IOException { final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in); YangInstanceIdentifier path = stream.readYangInstanceIdentifier(); - NormalizedNode node = stream.readNormalizedNode(); + NormalizedNode node = stream.readNormalizedNode(); applier.apply(instance, path, node); } public static void writePathAndNode(final DataOutput out, final org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion version, - final YangInstanceIdentifier path, final NormalizedNode node) throws IOException { + final YangInstanceIdentifier path, final NormalizedNode node) throws IOException { try (NormalizedNodeDataOutput stream = version.newDataOutput(out)) { stream.writeYangInstanceIdentifier(path); stream.writeNormalizedNode(node); @@ -117,7 +116,7 @@ public final class SerializationUtils { } public static void writePathAndNode(final DataOutput out, final YangInstanceIdentifier path, - final NormalizedNode node) throws IOException { + final NormalizedNode node) throws IOException { writePathAndNode(out, MAGNESIUM, path, node); } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java index 8999034504..13500c17c0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java @@ -64,7 +64,7 @@ abstract class AbstractNormalizedNodePruner implements NormalizedNodeStreamWrite private final DataSchemaContextTree tree; private DataSchemaContextNode nodePathSchemaNode; - private NormalizedNode normalizedNode; + private NormalizedNode normalizedNode; private State state = State.UNITIALIZED; private int unknown; @@ -114,12 +114,6 @@ abstract class AbstractNormalizedNodePruner implements NormalizedNodeStreamWrite enter(ReusableImmutableNormalizedNodeStreamWriter::startContainerNode, name, childSizeHint); } - @Override - public final void startYangModeledAnyXmlNode(final NodeIdentifier nodeIdentifier, final int count) { - // FIXME: implement this - throw new UnsupportedOperationException("Not implemented yet"); - } - @Override public final void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) throws IOException { enter(ReusableImmutableNormalizedNodeStreamWriter::startUnkeyedList, name, childSizeHint); @@ -235,7 +229,7 @@ abstract class AbstractNormalizedNodePruner implements NormalizedNodeStreamWrite * @return Resulting node for the path, if it was not pruned * @throws IllegalStateException if this pruner has not been closed */ - public final Optional> getResult() { + public final Optional getResult() { checkState(state == State.CLOSED, "Cannot get result in state %s", state); return Optional.ofNullable(normalizedNode); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/AbstractDataTreeModificationCursor.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/AbstractDataTreeModificationCursor.java index 1f5259eb82..35ab00f4f5 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/AbstractDataTreeModificationCursor.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/AbstractDataTreeModificationCursor.java @@ -71,7 +71,7 @@ public abstract class AbstractDataTreeModificationCursor implements DataTreeModi } @Override - public final Optional> readNode(final PathArgument child) { + public final Optional readNode(final PathArgument child) { throw new UnsupportedOperationException("Not implemented"); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/io/ChunkedOutputStream.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/io/ChunkedOutputStream.java index 8215e23ff3..73cdece20f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/io/ChunkedOutputStream.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/io/ChunkedOutputStream.java @@ -24,7 +24,7 @@ import java.util.ArrayDeque; import java.util.Arrays; import java.util.Deque; import java.util.Iterator; -import org.opendaylight.yangtools.concepts.Variant; +import org.opendaylight.yangtools.concepts.Either; /** * An {@link OutputStream} implementation which collects data is a series of {@code byte[]} chunks, each of which has @@ -124,10 +124,10 @@ public final class ChunkedOutputStream extends OutputStream { return size; } - public Variant toVariant() { + public Either toVariant() { checkClosed(); - return result instanceof byte[] ? Variant.ofFirst((byte[]) result) - : Variant.ofSecond(new ChunkedByteArray(size, (ImmutableList) result)); + return result instanceof byte[] ? Either.ofFirst((byte[]) result) + : Either.ofSecond(new ChunkedByteArray(size, (ImmutableList) result)); } @VisibleForTesting diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java index 88e58421c1..4a4416d576 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteSchemaProvider.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.schema.provider.impl; import akka.dispatch.OnComplete; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java index 04da2a6956..9af555d390 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java @@ -39,9 +39,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.OrderedMapNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; +import org.opendaylight.yangtools.yang.data.api.schema.UserMapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.w3c.dom.Document; @@ -52,7 +52,7 @@ public class SerializationUtilsTest { @Test public void testSerializeDeserializeNodes() throws IOException { - final NormalizedNode normalizedNode = createNormalizedNode(); + final NormalizedNode normalizedNode = createNormalizedNode(); final byte[] bytes = serializeNormalizedNode(normalizedNode); assertEquals(10564, bytes.length); assertEquals(normalizedNode, deserializeNormalizedNode(bytes)); @@ -64,14 +64,14 @@ public class SerializationUtilsTest { new ByteArrayInputStream("".getBytes(Charset.defaultCharset())); final Document parse = UntrustedXML.newDocumentBuilder().parse(is); final DOMSourceAnyxmlNode anyXmlNode = Builders.anyXmlBuilder() - .withNodeIdentifier(id("anyXmlNode")) + .withNodeIdentifier(id("anyXmlNode")) .withValue(new DOMSource(parse)) .build(); final byte[] bytes = serializeNormalizedNode(anyXmlNode); assertEquals(113, bytes.length); - final NormalizedNode deserialized = deserializeNormalizedNode(bytes); - final DOMSource value = (DOMSource) deserialized.getValue(); - final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.getValue().getNode(), + final NormalizedNode deserialized = deserializeNormalizedNode(bytes); + final DOMSource value = (DOMSource) deserialized.body(); + final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.body().getNode(), value.getNode().getOwnerDocument()); assertTrue(diff.toString(), diff.similar()); } @@ -100,7 +100,7 @@ public class SerializationUtilsTest { public void testSerializeDeserializePathAndNode() throws IOException { final ByteArrayOutputStream bos = new ByteArrayOutputStream(); final DataOutput out = new DataOutputStream(bos); - final NormalizedNode node = createNormalizedNode(); + final NormalizedNode node = createNormalizedNode(); final YangInstanceIdentifier path = YangInstanceIdentifier.create(id("container1")); SerializationUtils.writeNodeAndPath(out, path, node); @@ -136,17 +136,17 @@ public class SerializationUtilsTest { assertEquals(expected, read); } - private static NormalizedNode deserializeNormalizedNode(final byte[] bytes) throws IOException { + private static NormalizedNode deserializeNormalizedNode(final byte[] bytes) throws IOException { return SerializationUtils.readNormalizedNode(new DataInputStream(new ByteArrayInputStream(bytes))).get(); } - private static byte[] serializeNormalizedNode(final NormalizedNode node) throws IOException { + private static byte[] serializeNormalizedNode(final NormalizedNode node) throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); SerializationUtils.writeNormalizedNode(new DataOutputStream(bos), node); return bos.toByteArray(); } - private static NormalizedNode createNormalizedNode() { + private static NormalizedNode createNormalizedNode() { final LeafSetNode leafSetNode = Builders.leafSetBuilder() .withNodeIdentifier(id("leafSetNode")) .withChild(createLeafSetEntry("leafSetNode", "leafSetValue1")) @@ -179,7 +179,7 @@ public class SerializationUtilsTest { .withChild(entry1) .withChild(entry2) .build(); - final OrderedMapNode orderedMapNode = Builders.orderedMapBuilder() + final UserMapNode orderedMapNode = Builders.orderedMapBuilder() .withNodeIdentifier(id("orderedMapNode")) .withChild(entry2) .withChild(entry1) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java index 41e494c56d..8001ebd051 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java @@ -71,11 +71,11 @@ public class NormalizedNodePrunerTest { NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(pruner); - NormalizedNode expected = createTestContainer(); + NormalizedNode expected = createTestContainer(); normalizedNodeWriter.write(expected); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals(expected, actual); @@ -87,11 +87,11 @@ public class NormalizedNodePrunerTest { NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(pruner); - NormalizedNode expected = createTestContainer(); + NormalizedNode expected = createTestContainer(); normalizedNodeWriter.write(expected); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals(expected, actual); @@ -106,11 +106,11 @@ public class NormalizedNodePrunerTest { NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(pruner); - NormalizedNode expected = createTestContainer(); + NormalizedNode expected = createTestContainer(); normalizedNodeWriter.write(expected); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertNotEquals(expected, actual); @@ -127,7 +127,7 @@ public class NormalizedNodePrunerTest { NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(pruner); - NormalizedNode expected = createTestContainer(); + NormalizedNode expected = createTestContainer(); normalizedNodeWriter.write(expected); @@ -139,7 +139,7 @@ public class NormalizedNodePrunerTest { } - private static int countNodes(final NormalizedNode normalizedNode, final String namespaceFilter) { + private static int countNodes(final NormalizedNode normalizedNode, final String namespaceFilter) { if (normalizedNode == null) { return 0; } @@ -158,7 +158,7 @@ public class NormalizedNodePrunerTest { @Test public void testLeafNodeNotPrunedWhenHasNoParent() throws IOException { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.DESC_QNAME)); - NormalizedNode input = Builders.leafBuilder().withNodeIdentifier( + NormalizedNode input = Builders.leafBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.DESC_QNAME)).withValue("test").build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); @@ -173,17 +173,17 @@ public class NormalizedNodePrunerTest { .node(TestModel.AUGMENTED_LIST_QNAME).node(augId).build()); LeafNode child = Builders.leafBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.INVALID_QNAME)).withValue("test").build(); - NormalizedNode input = Builders.augmentationBuilder().withNodeIdentifier(augId).withChild(child).build(); + NormalizedNode input = Builders.augmentationBuilder().withNodeIdentifier(augId).withChild(child).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", Builders.augmentationBuilder().withNodeIdentifier(augId).build(), actual); } @Test public void testLeafNodePrunedWhenHasNoParentAndSchemaMissing() throws IOException { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.INVALID_QNAME)); - NormalizedNode input = Builders.leafBuilder().withNodeIdentifier( + NormalizedNode input = Builders.leafBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.INVALID_QNAME)).withValue("test").build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); @@ -193,11 +193,11 @@ public class NormalizedNodePrunerTest { @Test public void testLeafSetEntryNodeNotPrunedWhenHasNoParent() throws IOException { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.SHOE_QNAME)); - NormalizedNode input = Builders.leafSetEntryBuilder().withValue("puma").withNodeIdentifier( + NormalizedNode input = Builders.leafSetEntryBuilder().withValue("puma").withNodeIdentifier( new NodeWithValue<>(TestModel.SHOE_QNAME, "puma")).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", input, actual); } @@ -206,18 +206,18 @@ public class NormalizedNodePrunerTest { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.SHOE_QNAME)); LeafSetEntryNode child = Builders.leafSetEntryBuilder().withValue("puma").withNodeIdentifier( new NodeWithValue<>(TestModel.SHOE_QNAME, "puma")).build(); - NormalizedNode input = Builders.leafSetBuilder().withNodeIdentifier( + NormalizedNode input = Builders.leafSetBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.SHOE_QNAME)).withChild(child).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", input, actual); } @Test public void testLeafSetEntryNodePrunedWhenHasNoParentAndSchemaMissing() throws IOException { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.INVALID_QNAME)); - NormalizedNode input = Builders.leafSetEntryBuilder().withValue("test").withNodeIdentifier( + NormalizedNode input = Builders.leafSetEntryBuilder().withValue("test").withNodeIdentifier( new NodeWithValue<>(TestModel.INVALID_QNAME, "test")).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); @@ -229,7 +229,7 @@ public class NormalizedNodePrunerTest { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.INVALID_QNAME)); LeafSetEntryNode child = Builders.leafSetEntryBuilder().withValue("test").withNodeIdentifier( new NodeWithValue<>(TestModel.INVALID_QNAME, "test")).build(); - NormalizedNode input = Builders.leafSetBuilder().withNodeIdentifier( + NormalizedNode input = Builders.leafSetBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.INVALID_QNAME)).withChild(child).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); @@ -239,11 +239,11 @@ public class NormalizedNodePrunerTest { @Test public void testAnyXMLNodeNotPrunedWhenHasNoParent() throws IOException { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH.node(TestModel.ANY_XML_QNAME)); - NormalizedNode input = Builders.anyXmlBuilder().withNodeIdentifier( + NormalizedNode input = Builders.anyXmlBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.ANY_XML_QNAME)).withValue(mock(DOMSource.class)).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", input, actual); } @@ -252,18 +252,18 @@ public class NormalizedNodePrunerTest { AbstractNormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH); DOMSourceAnyxmlNode child = Builders.anyXmlBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.ANY_XML_QNAME)).withValue(mock(DOMSource.class)).build(); - NormalizedNode input = Builders.containerBuilder().withNodeIdentifier( + NormalizedNode input = Builders.containerBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.TEST_QNAME)).withChild(child).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", input, actual); } @Test public void testAnyXmlNodePrunedWhenHasNoParentAndSchemaMissing() throws IOException { AbstractNormalizedNodePruner pruner = prunerNoTestSchema(TestModel.TEST_PATH.node(TestModel.ANY_XML_QNAME)); - NormalizedNode input = Builders.anyXmlBuilder().withNodeIdentifier( + NormalizedNode input = Builders.anyXmlBuilder().withNodeIdentifier( new NodeIdentifier(TestModel.ANY_XML_QNAME)).withValue(mock(DOMSource.class)).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); @@ -278,10 +278,10 @@ public class NormalizedNodePrunerTest { .node(TestModel.INNER_CONTAINER_QNAME).build(); AbstractNormalizedNodePruner pruner = prunerFullSchema(path); - NormalizedNode input = ImmutableNodes.containerNode(TestModel.INNER_CONTAINER_QNAME); + NormalizedNode input = ImmutableNodes.containerNode(TestModel.INNER_CONTAINER_QNAME); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", input, actual); } @@ -293,7 +293,7 @@ public class NormalizedNodePrunerTest { .node(TestModel.INVALID_QNAME).build(); AbstractNormalizedNodePruner pruner = prunerFullSchema(path); - NormalizedNode input = ImmutableNodes.containerNode(TestModel.INVALID_QNAME); + NormalizedNode input = ImmutableNodes.containerNode(TestModel.INVALID_QNAME); NormalizedNodeWriter.forStreamWriter(pruner).write(input); assertEquals(Optional.empty(), pruner.getResult()); @@ -309,14 +309,14 @@ public class NormalizedNodePrunerTest { MapNode innerList = mapNodeBuilder(TestModel.INNER_LIST_QNAME).withChild(mapEntryBuilder( TestModel.INNER_LIST_QNAME, TestModel.NAME_QNAME, "one").withChild( ImmutableNodes.containerNode(TestModel.INVALID_QNAME)).build()).build(); - NormalizedNode input = mapEntryBuilder(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1) + NormalizedNode input = mapEntryBuilder(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1) .withChild(innerList).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode expected = mapEntryBuilder(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1) + NormalizedNode expected = mapEntryBuilder(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1) .withChild(mapNodeBuilder(TestModel.INNER_LIST_QNAME).withChild(mapEntryBuilder( TestModel.INNER_LIST_QNAME, TestModel.NAME_QNAME, "one").build()).build()).build(); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", expected, actual); } @@ -332,7 +332,7 @@ public class NormalizedNodePrunerTest { ImmutableNodes.containerNode(TestModel.INNER_CONTAINER_QNAME)).build()).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", input, actual); } @@ -361,16 +361,16 @@ public class NormalizedNodePrunerTest { MapNode innerList = mapNodeBuilder(TestModel.INVALID_QNAME).withChild(mapEntryBuilder( TestModel.INVALID_QNAME, TestModel.NAME_QNAME, "one").withChild( ImmutableNodes.containerNode(TestModel.INNER_CONTAINER_QNAME)).build()).build(); - NormalizedNode input = mapEntryBuilder(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1) + NormalizedNode input = mapEntryBuilder(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1) .withChild(innerList).build(); NormalizedNodeWriter.forStreamWriter(pruner).write(input); - NormalizedNode expected = mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1); - NormalizedNode actual = pruner.getResult().orElseThrow(); + NormalizedNode expected = mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1); + NormalizedNode actual = pruner.getResult().orElseThrow(); assertEquals("normalizedNode", expected, actual); } - private static NormalizedNode createTestContainer() { + private static NormalizedNode createTestContainer() { byte[] bytes1 = {1, 2, 3}; LeafSetEntryNode entry1 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, bytes1)).withValue(bytes1).build(); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/UintAdaptingPrunerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/UintAdaptingPrunerTest.java index 33f6058ea7..bba8739813 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/UintAdaptingPrunerTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/UintAdaptingPrunerTest.java @@ -201,7 +201,7 @@ public class UintAdaptingPrunerTest { .build())); } - private static NormalizedNode prune(final NormalizedNode node) throws IOException { + private static NormalizedNode prune(final NormalizedNode node) throws IOException { final ReusableNormalizedNodePruner pruner = ReusableNormalizedNodePruner.forSchemaContext(CONTEXT) .withUintAdaption(); pruner.initializeForPath(YangInstanceIdentifier.create(node.getIdentifier())); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java index c613d6cf62..7120c31de0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java @@ -32,13 +32,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; +import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; @@ -335,8 +335,8 @@ public final class TestModel { familyContainerBuilder = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new NodeIdentifier(FAMILY_QNAME)); - final CollectionNodeBuilder childrenBuilder = - mapNodeBuilder(CHILDREN_QNAME); + final CollectionNodeBuilder childrenBuilder = mapNodeBuilder() + .withNodeIdentifier(new NodeIdentifier(CHILDREN_QNAME)); final DataContainerNodeBuilder firstChildBuilder = mapEntryBuilder(CHILDREN_QNAME, CHILD_NUMBER_QNAME, FIRST_CHILD_ID); diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 068613dab0..3dd54c2d7c 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 - 8.1.1 + 9.0.1 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java index 39703f0f67..02e9e047f4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java @@ -73,15 +73,14 @@ public abstract class AbstractDOMBrokerWriteTransaction data) { + public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) { checkRunning(commitImpl); checkInstanceIdentifierReferencesData(path,data); getSubtransaction(store).write(path, data); } private static void checkInstanceIdentifierReferencesData(final YangInstanceIdentifier path, - final NormalizedNode data) { + final NormalizedNode data) { checkArgument(data != null, "Attempted to store null data at %s", path); final PathArgument lastArg = path.getLastPathArgument(); if (lastArg != null) { @@ -97,8 +96,7 @@ public abstract class AbstractDOMBrokerWriteTransaction data) { + public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) { checkRunning(commitImpl); checkInstanceIdentifierReferencesData(path, data); getSubtransaction(store).merge(path, data); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java index 30a51dea4a..274c07e99b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransaction.java @@ -38,7 +38,7 @@ final class ClientBackedReadTransaction extends ClientBackedTransaction>> read(final YangInstanceIdentifier path) { + public FluentFuture> read(final YangInstanceIdentifier path) { return delegate().read(path); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransaction.java index 6931d9accb..861dcd3a7d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransaction.java @@ -28,7 +28,7 @@ final class ClientBackedReadWriteTransaction extends ClientBackedWriteTransactio } @Override - public FluentFuture>> read(final YangInstanceIdentifier path) { + public FluentFuture> read(final YangInstanceIdentifier path) { return delegate().read(path); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransaction.java index a1ffb3b256..2b5cf89ff9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransaction.java @@ -26,12 +26,12 @@ class ClientBackedWriteTransaction extends ClientBackedTransaction data) { + public final void write(final YangInstanceIdentifier path, final NormalizedNode data) { delegate().write(path, data); } @Override - public final void merge(final YangInstanceIdentifier path, final NormalizedNode data) { + public final void merge(final YangInstanceIdentifier path, final NormalizedNode data) { delegate().merge(path, data); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadOnlyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadOnlyTransaction.java index afce5c053d..c4d5e1d8a5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadOnlyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadOnlyTransaction.java @@ -26,13 +26,13 @@ public class DOMBrokerReadOnlyTransaction * * @param identifier Identifier of transaction. */ - protected DOMBrokerReadOnlyTransaction(Object identifier, - Map storeTxFactories) { + protected DOMBrokerReadOnlyTransaction(final Object identifier, + final Map storeTxFactories) { super(identifier, storeTxFactories); } @Override - public FluentFuture>> read(final LogicalDatastoreType store, + public FluentFuture> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) { return getSubtransaction(store).read(path); } @@ -48,7 +48,7 @@ public class DOMBrokerReadOnlyTransaction } @Override - protected DOMStoreReadTransaction createTransaction(LogicalDatastoreType key) { + protected DOMStoreReadTransaction createTransaction(final LogicalDatastoreType key) { return getTxFactory(key).newReadOnlyTransaction(); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadWriteTransaction.java index 86b915bc9d..d9031c2d62 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerReadWriteTransaction.java @@ -26,14 +26,14 @@ public class DOMBrokerReadWriteTransaction extends AbstractDOMBrokerWriteTransac * @param identifier identifier of transaction. * @param storeTxFactories the backing transaction store factories */ - protected DOMBrokerReadWriteTransaction(Object identifier, - Map storeTxFactories, + protected DOMBrokerReadWriteTransaction(final Object identifier, + final Map storeTxFactories, final AbstractDOMTransactionFactory commitImpl) { super(identifier, storeTxFactories, commitImpl); } @Override - public FluentFuture>> read(final LogicalDatastoreType store, + public FluentFuture> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) { return getSubtransaction(store).read(path); } @@ -44,7 +44,7 @@ public class DOMBrokerReadWriteTransaction extends AbstractDOMBrokerWriteTransac } @Override - protected DOMStoreReadWriteTransaction createTransaction(LogicalDatastoreType key) { + protected DOMStoreReadWriteTransaction createTransaction(final LogicalDatastoreType key) { return getTxFactory(key).newReadWriteTransaction(); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java index 1ed1e940d3..8fb042fba1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java @@ -294,13 +294,13 @@ abstract class AbstractProxyTransaction implements Identifiable data) { + final void merge(final YangInstanceIdentifier path, final NormalizedNode data) { checkReadWrite(); checkNotSealed(); doMerge(path, data); } - final void write(final YangInstanceIdentifier path, final NormalizedNode data) { + final void write(final YangInstanceIdentifier path, final NormalizedNode data) { checkReadWrite(); checkNotSealed(); doWrite(path, data); @@ -311,7 +311,7 @@ abstract class AbstractProxyTransaction implements Identifiable>> read(final YangInstanceIdentifier path) { + final FluentFuture> read(final YangInstanceIdentifier path) { checkNotSealed(); return doRead(path); } @@ -801,13 +801,13 @@ abstract class AbstractProxyTransaction implements Identifiable data); + abstract void doMerge(YangInstanceIdentifier path, NormalizedNode data); - abstract void doWrite(YangInstanceIdentifier path, NormalizedNode data); + abstract void doWrite(YangInstanceIdentifier path, NormalizedNode data); abstract FluentFuture doExists(YangInstanceIdentifier path); - abstract FluentFuture>> doRead(YangInstanceIdentifier path); + abstract FluentFuture> doRead(YangInstanceIdentifier path); @GuardedBy("this") abstract Optional flushState(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshot.java index c8b1328cfd..d20a618c3d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshot.java @@ -31,7 +31,7 @@ public class ClientSnapshot extends AbstractClientHandle>> read(final YangInstanceIdentifier path) { + public FluentFuture> read(final YangInstanceIdentifier path) { return ensureSnapshotProxy(path).read(path); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java index 794a1be960..9b4c5a962f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java @@ -62,7 +62,7 @@ public class ClientTransaction extends AbstractClientHandle>> read(final YangInstanceIdentifier path) { + public FluentFuture> read(final YangInstanceIdentifier path) { return ensureTransactionProxy(path).read(path); } @@ -70,11 +70,11 @@ public class ClientTransaction extends AbstractClientHandle data) { + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { ensureTransactionProxy(path).merge(path, data); } - public void write(final YangInstanceIdentifier path, final NormalizedNode data) { + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { ensureTransactionProxy(path).write(path, data); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java index 6edbf6ca0d..561870839d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java @@ -81,7 +81,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { } @Override - final FluentFuture>> doRead(final YangInstanceIdentifier path) { + final FluentFuture> doRead(final YangInstanceIdentifier path) { return FluentFutures.immediateFluentFuture(readOnlyView().readNode(path)); } @@ -105,7 +105,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { // listeners, which we do not want to execute while we are reconnecting. if (request instanceof ReadTransactionRequest) { final YangInstanceIdentifier path = ((ReadTransactionRequest) request).getPath(); - final Optional> result = readOnlyView().readNode(path); + final Optional result = readOnlyView().readNode(path); if (callback != null) { // XXX: FB does not see that callback is final, on stack and has be check for non-null. final Consumer> fbIsStupid = requireNonNull(callback); @@ -176,12 +176,12 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { LOG.debug("Applying modification {} to successor {}", mod, successor); mod.applyToCursor(new AbstractDataTreeModificationCursor() { @Override - public void write(final PathArgument child, final NormalizedNode data) { + public void write(final PathArgument child, final NormalizedNode data) { successor.write(current().node(child), data); } @Override - public void merge(final PathArgument child, final NormalizedNode data) { + public void merge(final PathArgument child, final NormalizedNode data) { successor.merge(current().node(child), data); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadOnlyProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadOnlyProxyTransaction.java index f9de02d991..8cdbcf878c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadOnlyProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadOnlyProxyTransaction.java @@ -28,7 +28,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; * @author Robert Varga */ final class LocalReadOnlyProxyTransaction extends LocalProxyTransaction { - private final DataTreeSnapshot snapshot; LocalReadOnlyProxyTransaction(final ProxyHistory parent, final TransactionIdentifier identifier, @@ -59,12 +58,12 @@ final class LocalReadOnlyProxyTransaction extends LocalProxyTransaction { } @Override - void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { + void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { throw new UnsupportedOperationException("doMerge"); } @Override - void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { + void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { throw new UnsupportedOperationException("doWrite"); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java index 9fa8ac7c42..1f1e394932 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java @@ -125,7 +125,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { @Override @SuppressWarnings("checkstyle:IllegalCatch") - void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { + void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { final CursorAwareDataTreeModification mod = getModification(); if (recordedFailure != null) { LOG.debug("Transaction {} recorded failure, ignoring merge to {}", getIdentifier(), path); @@ -143,7 +143,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { @Override @SuppressWarnings("checkstyle:IllegalCatch") - void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { + void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { final CursorAwareDataTreeModification mod = getModification(); if (recordedFailure != null) { LOG.debug("Transaction {} recorded failure, ignoring write to {}", getIdentifier(), path); @@ -202,12 +202,12 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { sealedModification.applyToCursor(new AbstractDataTreeModificationCursor() { @Override - public void write(final PathArgument child, final NormalizedNode data) { + public void write(final PathArgument child, final NormalizedNode data) { b.addModification(new TransactionWrite(current().node(child), data)); } @Override - public void merge(final PathArgument child, final NormalizedNode data) { + public void merge(final PathArgument child, final NormalizedNode data) { b.addModification(new TransactionMerge(current().node(child), data)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java index d0d7946f62..824a2f9b31 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java @@ -105,12 +105,12 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { } @Override - void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { + void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { appendModification(new TransactionMerge(path, data), OptionalLong.empty()); } @Override - void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { + void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { appendModification(new TransactionWrite(path, data), OptionalLong.empty()); } @@ -137,8 +137,8 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { } @Override - FluentFuture>> doRead(final YangInstanceIdentifier path) { - final SettableFuture>> future = SettableFuture.create(); + FluentFuture> doRead(final YangInstanceIdentifier path) { + final SettableFuture> future = SettableFuture.create(); return sendReadRequest(new ReadTransactionRequest(getIdentifier(), nextSequence(), localActor(), path, isSnapshotOnly()), t -> completeRead(path, future, t), future); } @@ -239,8 +239,8 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { recordFinishedRequest(response); } - private void completeRead(final YangInstanceIdentifier path, - final SettableFuture>> future, final Response response) { + private void completeRead(final YangInstanceIdentifier path, final SettableFuture> future, + final Response response) { LOG.debug("Read request for {} completed with {}", path, response); if (response instanceof ReadTransactionSuccess) { @@ -415,12 +415,12 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { mod.applyToCursor(new AbstractDataTreeModificationCursor() { @Override - public void write(final PathArgument child, final NormalizedNode data) { + public void write(final PathArgument child, final NormalizedNode data) { appendModification(new TransactionWrite(current().node(child), data), optTicks); } @Override - public void merge(final PathArgument child, final NormalizedNode data) { + public void merge(final PathArgument child, final NormalizedNode data) { appendModification(new TransactionMerge(current().node(child), data), optTicks); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadOnlyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadOnlyTransaction.java index 512e9f4957..e8b99e60a5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadOnlyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadOnlyTransaction.java @@ -81,13 +81,13 @@ final class FrontendReadOnlyTransaction extends FrontendTransaction { } private ExistsTransactionSuccess handleExistsTransaction(final ExistsTransactionRequest request) { - final Optional> data = openTransaction.getSnapshot().readNode(request.getPath()); + final Optional data = openTransaction.getSnapshot().readNode(request.getPath()); return recordSuccess(request.getSequence(), new ExistsTransactionSuccess(openTransaction.getIdentifier(), request.getSequence(), data.isPresent())); } private ReadTransactionSuccess handleReadTransaction(final ReadTransactionRequest request) { - final Optional> data = openTransaction.getSnapshot().readNode(request.getPath()); + final Optional data = openTransaction.getSnapshot().readNode(request.getPath()); return recordSuccess(request.getSequence(), new ReadTransactionSuccess(openTransaction.getIdentifier(), request.getSequence(), data)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java index 777490b40c..4bd2a57257 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java @@ -524,13 +524,13 @@ final class FrontendReadWriteTransaction extends FrontendTransaction { } private ExistsTransactionSuccess handleExistsTransaction(final ExistsTransactionRequest request) { - final Optional> data = checkOpen().getSnapshot().readNode(request.getPath()); + final Optional data = checkOpen().getSnapshot().readNode(request.getPath()); return recordSuccess(request.getSequence(), new ExistsTransactionSuccess(getIdentifier(), request.getSequence(), data.isPresent())); } private ReadTransactionSuccess handleReadTransaction(final ReadTransactionRequest request) { - final Optional> data = checkOpen().getSnapshot().readNode(request.getPath()); + final Optional data = checkOpen().getSnapshot().readNode(request.getPath()); return recordSuccess(request.getSequence(), new ReadTransactionSuccess(getIdentifier(), request.getSequence(), data)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java index b201486fb2..5435bb548d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java @@ -50,7 +50,7 @@ abstract class LocalTransactionContext extends AbstractTransactionContext { protected abstract DOMStoreReadTransaction getReadDelegate(); @SuppressWarnings("checkstyle:IllegalCatch") - private void executeModification(Consumer consumer) { + private void executeModification(final Consumer consumer) { incrementModificationCount(); if (operationError == null) { try { @@ -67,14 +67,12 @@ abstract class LocalTransactionContext extends AbstractTransactionContext { } @Override - public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, - final Boolean havePermit) { + public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) { executeModification(transaction -> transaction.merge(path, data)); } @Override - public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, - final Boolean havePermit) { + public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) { executeModification(transaction -> transaction.write(path, data)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpTransactionContext.java index cee9d784ac..d98a1b4046 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpTransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/NoOpTransactionContext.java @@ -72,14 +72,12 @@ final class NoOpTransactionContext extends AbstractTransactionContext { } @Override - public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, - final Boolean havePermit) { + public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) { LOG.debug("Tx {} executeMerge called path = {}", getIdentifier(), path); } @Override - public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, - final Boolean havePermit) { + public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) { LOG.debug("Tx {} executeWrite called path = {}", getIdentifier(), path); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java index ba1d05068b..a7e76ed436 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java @@ -208,15 +208,13 @@ public class RemoteTransactionContext extends AbstractTransactionContext { } @Override - public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, - final Boolean havePermit) { + public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) { LOG.debug("Tx {} executeMerge called path = {}", getIdentifier(), path); executeModification(new MergeModification(path, data), havePermit); } @Override - public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, - final Boolean havePermit) { + public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) { LOG.debug("Tx {} executeWrite called path = {}", getIdentifier(), path); executeModification(new WriteModification(path, data), havePermit); } @@ -226,7 +224,7 @@ public class RemoteTransactionContext extends AbstractTransactionContext { if (havePermit == null) { permitToRelease = failedModification == null && acquireOperation(); } else { - permitToRelease = havePermit.booleanValue(); + permitToRelease = havePermit; } batchModification(modification, permitToRelease); @@ -251,7 +249,7 @@ public class RemoteTransactionContext extends AbstractTransactionContext { // Send any batched modifications. This is necessary to honor the read uncommitted semantics of the // public API contract. - final boolean permitToRelease = havePermit == null ? acquireOperation() : havePermit.booleanValue(); + final boolean permitToRelease = havePermit == null ? acquireOperation() : havePermit; sendBatchedModifications(); OnComplete onComplete = new OnComplete<>() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RootDataTreeChangeListenerActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RootDataTreeChangeListenerActor.java index 8a826ef67a..8322289618 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RootDataTreeChangeListenerActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RootDataTreeChangeListenerActor.java @@ -26,11 +26,11 @@ 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.api.schema.builder.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; final class RootDataTreeChangeListenerActor extends DataTreeChangeListenerActor { @@ -111,9 +111,9 @@ final class RootDataTreeChangeListenerActor extends DataTreeChangeListenerActor initial = Iterables.get(changes, 0); } - final NormalizedNode root = initial.getRootNode().getDataAfter().orElseThrow(); + final NormalizedNode root = initial.getRootNode().getDataAfter().orElseThrow(); verify(root instanceof ContainerNode, "Unexpected root node %s", root); - ((ContainerNode) root).getValue().forEach(rootBuilder::withChild); + ((ContainerNode) root).body().forEach(rootBuilder::withChild); } } // We will not be intercepting any other messages, allow initial state to be reclaimed as soon as possible diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java index b3688a87fa..bd5d7360b2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java @@ -231,7 +231,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { * @return A state snapshot */ @NonNull ShardDataTreeSnapshot takeStateSnapshot() { - final NormalizedNode rootNode = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()).get(); + final NormalizedNode rootNode = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()).get(); final Builder>, ShardDataTreeSnapshotMetadata> metaBuilder = ImmutableMap.builder(); @@ -278,7 +278,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { // delete everything first mod.delete(YangInstanceIdentifier.empty()); - final Optional> maybeNode = snapshot.getRootNode(); + final Optional maybeNode = snapshot.getRootNode(); if (maybeNode.isPresent()) { // Add everything from the remote node back mod.write(YangInstanceIdentifier.empty(), maybeNode.get()); @@ -739,7 +739,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { id, shard.getDatastoreContext().getInitialPayloadSerializedBufferCapacity()), callback); } - public Optional> readNode(final YangInstanceIdentifier path) { + public Optional readNode(final YangInstanceIdentifier path) { return dataTree.takeSnapshot().readNode(path); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java index a6c56a5473..87d70da1ab 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java @@ -105,7 +105,7 @@ abstract class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { open = false; } - private File writeRoot(final String kind, final NormalizedNode node) { + private File writeRoot(final String kind, final NormalizedNode node) { final File file = new File(System.getProperty("karaf.data", "."), "failed-recovery-" + kind + "-" + shardName + ".xml"); NormalizedNodeXMLOutput.toFile(file, node); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java index fe36661e67..cafc2a82ea 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java @@ -29,9 +29,9 @@ interface TransactionContext { void executeDelete(YangInstanceIdentifier path, Boolean havePermit); - void executeMerge(YangInstanceIdentifier path, NormalizedNode data, Boolean havePermit); + void executeMerge(YangInstanceIdentifier path, NormalizedNode data, Boolean havePermit); - void executeWrite(YangInstanceIdentifier path, NormalizedNode data, Boolean havePermit); + void executeWrite(YangInstanceIdentifier path, NormalizedNode data, Boolean havePermit); Future directCommit(Boolean havePermit); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionModificationOperation.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionModificationOperation.java index 9f7b008f65..eeaec6b998 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionModificationOperation.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionModificationOperation.java @@ -18,14 +18,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ abstract class TransactionModificationOperation extends TransactionOperation { private abstract static class AbstractDataOperation extends TransactionModificationOperation { - private final NormalizedNode data; + private final NormalizedNode data; - AbstractDataOperation(final YangInstanceIdentifier path, final NormalizedNode data) { + AbstractDataOperation(final YangInstanceIdentifier path, final NormalizedNode data) { super(path); this.data = requireNonNull(data); } - final NormalizedNode data() { + final NormalizedNode data() { return data; } } @@ -42,7 +42,7 @@ abstract class TransactionModificationOperation extends TransactionOperation { } static final class MergeOperation extends AbstractDataOperation { - MergeOperation(final YangInstanceIdentifier path, final NormalizedNode data) { + MergeOperation(final YangInstanceIdentifier path, final NormalizedNode data) { super(path, data); } @@ -53,7 +53,7 @@ abstract class TransactionModificationOperation extends TransactionOperation { } static final class WriteOperation extends AbstractDataOperation { - WriteOperation(final YangInstanceIdentifier path, final NormalizedNode data) { + WriteOperation(final YangInstanceIdentifier path, final NormalizedNode data) { super(path, data); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java index 9e5985a741..ce0461ffaf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java @@ -47,9 +47,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.concurrent.Future; @@ -107,7 +107,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction>> read(final YangInstanceIdentifier path) { + public FluentFuture> read(final YangInstanceIdentifier path) { checkState(type != TransactionType.WRITE_ONLY, "Reads from write-only transactions are not allowed"); requireNonNull(path, "path should not be null"); @@ -115,21 +115,21 @@ public class TransactionProxy extends AbstractDOMStoreTransaction>> singleShardRead( - final String shardName, final YangInstanceIdentifier path) { + private FluentFuture> singleShardRead(final String shardName, + final YangInstanceIdentifier path) { return executeRead(shardName, new ReadData(path, DataStoreVersions.CURRENT_VERSION)); } - private FluentFuture>> readAllData() { + private FluentFuture> readAllData() { final Set allShardNames = txContextFactory.getActorUtils().getConfiguration().getAllShardNames(); - final Collection>>> futures = new ArrayList<>(allShardNames.size()); + final Collection>> futures = new ArrayList<>(allShardNames.size()); for (String shardName : allShardNames) { futures.add(singleShardRead(shardName, YangInstanceIdentifier.empty())); } - final ListenableFuture>>> listFuture = Futures.allAsList(futures); - final ListenableFuture>> aggregateFuture; + final ListenableFuture>> listFuture = Futures.allAsList(futures); + final ListenableFuture> aggregateFuture; aggregateFuture = Futures.transform(listFuture, input -> { try { @@ -162,7 +162,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction data) { + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { checkModificationState("merge", path); if (path.isEmpty()) { @@ -175,7 +175,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction> rootBuilders = new HashMap<>(); - for (DataContainerChild child : rootData.getValue()) { + for (DataContainerChild child : rootData.body()) { final String shardName = shardNameFromRootChild(child); rootBuilders.computeIfAbsent(shardName, unused -> Builders.containerBuilder().withNodeIdentifier(rootData.getIdentifier())) @@ -190,7 +190,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction data) { + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { checkModificationState("write", path); if (path.isEmpty()) { @@ -208,7 +208,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction child : rootData.getValue()) { + for (DataContainerChild child : rootData.body()) { final String shardName = shardNameFromRootChild(child); verifyNotNull(rootBuilders.get(shardName), "Failed to find builder for %s", shardName).addChild(child); } @@ -224,7 +224,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction data) { + private static ContainerNode checkRootData(final NormalizedNode data) { // Root has to be a container checkArgument(data instanceof ContainerNode, "Invalid root data %s", data); return (ContainerNode) data; @@ -353,7 +353,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction child) { + private String shardNameFromRootChild(final DataContainerChild child) { return shardNameFromIdentifier(YangInstanceIdentifier.create(child.getIdentifier())); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java index ab52385893..8e132f26d1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java @@ -182,7 +182,7 @@ public class ConfigurationImpl implements Configuration { requireNonNull(config, "ModuleShardConfiguration should not be null"); ModuleConfig moduleConfig = ModuleConfig.builder(config.getModuleName()) - .nameSpace(config.getNamespace().toASCIIString()) + .nameSpace(config.getNamespace().toString()) .shardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName())) .shardConfig(config.getShardName(), config.getShardMemberNames()).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleShardConfiguration.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleShardConfiguration.java index d858b5f962..177eb8d734 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleShardConfiguration.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleShardConfiguration.java @@ -9,11 +9,11 @@ package org.opendaylight.controller.cluster.datastore.config; import static java.util.Objects.requireNonNull; -import java.net.URI; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.access.concepts.MemberName; +import org.opendaylight.yangtools.yang.common.XMLNamespace; /** * Encapsulates information for adding a new module shard configuration. @@ -21,7 +21,7 @@ import org.opendaylight.controller.cluster.access.concepts.MemberName; * @author Thomas Pantelis */ public class ModuleShardConfiguration { - private final URI namespace; + private final XMLNamespace namespace; private final String moduleName; private final String shardName; private final String shardStrategyName; @@ -37,8 +37,9 @@ public class ModuleShardConfiguration { * is used. * @param shardMemberNames the names of the shard's member replicas. */ - public ModuleShardConfiguration(@NonNull URI namespace, @NonNull String moduleName, @NonNull String shardName, - @Nullable String shardStrategyName, @NonNull Collection shardMemberNames) { + public ModuleShardConfiguration(final @NonNull XMLNamespace namespace, final @NonNull String moduleName, + final @NonNull String shardName, final @Nullable String shardStrategyName, + final @NonNull Collection shardMemberNames) { this.namespace = requireNonNull(namespace, "nameSpace should not be null"); this.moduleName = requireNonNull(moduleName, "moduleName should not be null"); this.shardName = requireNonNull(shardName, "shardName should not be null"); @@ -46,7 +47,7 @@ public class ModuleShardConfiguration { this.shardMemberNames = requireNonNull(shardMemberNames, "shardMemberNames"); } - public URI getNamespace() { + public XMLNamespace getNamespace() { return namespace; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java index 6352b5734b..1113a854bf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore.messages; import com.google.common.base.Preconditions; @@ -17,33 +16,34 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -public class ReadData extends AbstractRead>> { +public class ReadData extends AbstractRead> { private static final long serialVersionUID = 1L; public ReadData() { } - public ReadData(final YangInstanceIdentifier path, short version) { + public ReadData(final YangInstanceIdentifier path, final short version) { super(path, version); } @Override - public FluentFuture>> apply(DOMStoreReadTransaction readDelegate) { + public FluentFuture> apply(final DOMStoreReadTransaction readDelegate) { return readDelegate.read(getPath()); } @Override - public void processResponse(Object readResponse, SettableFuture>> returnFuture) { + public void processResponse(final Object readResponse, + final SettableFuture> returnFuture) { if (ReadDataReply.isSerializedType(readResponse)) { ReadDataReply reply = ReadDataReply.fromSerializable(readResponse); - returnFuture.set(Optional.>ofNullable(reply.getNormalizedNode())); + returnFuture.set(Optional.ofNullable(reply.getNormalizedNode())); } else { returnFuture.setException(new ReadFailedException("Invalid response reading data for path " + getPath())); } } @Override - protected AbstractRead>> newInstance(short withVersion) { + protected AbstractRead> newInstance(final short withVersion) { return new ReadData(getPath(), withVersion); } @@ -52,7 +52,7 @@ public class ReadData extends AbstractRead>> { return (ReadData)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof ReadData; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java index 91d38ccd07..099ca228cd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore.messages; import java.io.IOException; @@ -17,17 +16,17 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class ReadDataReply extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; - private NormalizedNode normalizedNode; + private NormalizedNode normalizedNode; public ReadDataReply() { } - public ReadDataReply(final NormalizedNode normalizedNode, final short version) { + public ReadDataReply(final NormalizedNode normalizedNode, final short version) { super(version); this.normalizedNode = normalizedNode; } - public NormalizedNode getNormalizedNode() { + public NormalizedNode getNormalizedNode() { return normalizedNode; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/UpdateSchemaContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/UpdateSchemaContext.java index 96ae3820e7..ad32ecfb69 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/UpdateSchemaContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/UpdateSchemaContext.java @@ -8,7 +8,7 @@ package org.opendaylight.controller.cluster.datastore.messages; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.util.AbstractEffectiveModelContextProvider; +import org.opendaylight.yangtools.yang.model.spi.AbstractEffectiveModelContextProvider; public class UpdateSchemaContext extends AbstractEffectiveModelContextProvider { public UpdateSchemaContext(final EffectiveModelContext modelContext) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java index 0dbc480e96..098a89521a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java @@ -30,11 +30,11 @@ public class MergeModification extends WriteModification { super(version); } - public MergeModification(final YangInstanceIdentifier path, final NormalizedNode data) { + public MergeModification(final YangInstanceIdentifier path, final NormalizedNode data) { super(path, data); } - MergeModification(final short version, final YangInstanceIdentifier path, final NormalizedNode data) { + MergeModification(final short version, final YangInstanceIdentifier path, final NormalizedNode data) { super(version, path, data); } @@ -55,7 +55,7 @@ public class MergeModification extends WriteModification { public static MergeModification fromStream(final NormalizedNodeDataInput in, final short version, final ReusableStreamReceiver receiver) throws IOException { - final NormalizedNode node = in.readNormalizedNode(receiver); + final NormalizedNode node = in.readNormalizedNode(receiver); final YangInstanceIdentifier path = in.readYangInstanceIdentifier(); return new MergeModification(version, path, node); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java index dde0be7af5..9e00d4b174 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutpu public class WriteModification extends AbstractModification { private static final long serialVersionUID = 1L; - private NormalizedNode data; + private NormalizedNode data; public WriteModification() { this(DataStoreVersions.CURRENT_VERSION); @@ -36,12 +36,12 @@ public class WriteModification extends AbstractModification { super(version); } - WriteModification(final short version, final YangInstanceIdentifier path, final NormalizedNode data) { + WriteModification(final short version, final YangInstanceIdentifier path, final NormalizedNode data) { super(version, path); this.data = data; } - public WriteModification(final YangInstanceIdentifier path, final NormalizedNode data) { + public WriteModification(final YangInstanceIdentifier path, final NormalizedNode data) { super(path); this.data = data; } @@ -56,7 +56,7 @@ public class WriteModification extends AbstractModification { transaction.write(getPath(), data); } - public NormalizedNode getData() { + public NormalizedNode getData() { return data; } @@ -80,7 +80,7 @@ public class WriteModification extends AbstractModification { public static WriteModification fromStream(final NormalizedNodeDataInput in, final short version, final ReusableStreamReceiver receiver) throws IOException { - final NormalizedNode node = in.readNormalizedNode(receiver); + final NormalizedNode node = in.readNormalizedNode(receiver); final YangInstanceIdentifier path = in.readYangInstanceIdentifier(); return new WriteModification(version, path, node); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java index 8ef201c314..453bbbb21a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java @@ -41,7 +41,7 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode { } @Override - public final Optional> getDataBefore() { + public final Optional getDataBefore() { throw new UnsupportedOperationException("Before-image not available after serialization"); } @@ -53,7 +53,7 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode { } @Override - public Optional> getDataAfter() { + public Optional getDataAfter() { throw new UnsupportedOperationException("After-image not available after serialization"); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java index 5572794271..0667f7c039 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; -import com.google.common.base.Verify; +import static com.google.common.base.Verify.verifyNotNull; + import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -56,8 +57,8 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps } @Override - public final Optional> getRootNode() { - return Optional.of(Verify.verifyNotNull(rootNode(), "Snapshot %s returned non-present root node", getClass())); + public final Optional getRootNode() { + return Optional.of(verifyNotNull(rootNode(), "Snapshot %s returned non-present root node", getClass())); } /** @@ -65,7 +66,7 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps * * @return The root node. */ - abstract @NonNull NormalizedNode rootNode(); + abstract @NonNull NormalizedNode rootNode(); /** * Return the snapshot payload version. Implementations of this method should return a constant. diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java index 29a328730a..5337530ece 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java @@ -32,7 +32,7 @@ import org.opendaylight.controller.cluster.datastore.persisted.DataTreeCandidate import org.opendaylight.controller.cluster.io.ChunkedByteArray; import org.opendaylight.controller.cluster.io.ChunkedOutputStream; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.IdentifiablePayload; -import org.opendaylight.yangtools.concepts.Variant; +import org.opendaylight.yangtools.concepts.Either; import org.opendaylight.yangtools.yang.data.api.schema.stream.ReusableStreamReceiver; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.impl.schema.ReusableImmutableNormalizedNodeStreamWriter; @@ -69,7 +69,7 @@ public abstract class CommitTransactionPayload extends IdentifiablePayload source = cos.toVariant(); + final Either source = cos.toVariant(); LOG.debug("Initial buffer capacity {}, actual serialized size {}", initialSerializedBufferCapacity, cos.size()); return source.isFirst() ? new Simple(source.getFirst()) : new Chunked(source.getSecond()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DeletedDataTreeCandidateNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DeletedDataTreeCandidateNode.java index ae88112095..de386f1757 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DeletedDataTreeCandidateNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DeletedDataTreeCandidateNode.java @@ -41,7 +41,7 @@ abstract class DeletedDataTreeCandidateNode extends AbstractDataTreeCandidateNod } @Override - public final Optional> getDataAfter() { + public final Optional getDataAfter() { return Optional.empty(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java index d21e1987d4..a97f8f46f3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java @@ -43,7 +43,7 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD private Map>, ShardDataTreeSnapshotMetadata> metadata; private NormalizedNodeStreamVersion version; - private NormalizedNode rootNode; + private NormalizedNode rootNode; // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection. @@ -111,13 +111,13 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD private final Map>, ShardDataTreeSnapshotMetadata> metadata; @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "See above justification.") - private final NormalizedNode rootNode; + private final NormalizedNode rootNode; - public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode) { + public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode) { this(rootNode, ImmutableMap.of()); } - public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode, + public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode, final Map>, ShardDataTreeSnapshotMetadata> metadata) { this.rootNode = requireNonNull(rootNode); this.metadata = ImmutableMap.copyOf(metadata); @@ -128,7 +128,7 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD } @Override - NormalizedNode rootNode() { + NormalizedNode rootNode() { return rootNode; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java index 2cede0db5e..061d913429 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java @@ -49,7 +49,7 @@ abstract class ModifiedDataTreeCandidateNode extends AbstractDataTreeCandidateNo } @Override - public final Optional> getDataAfter() { + public final Optional getDataAfter() { throw new UnsupportedOperationException("After-image not available after serialization"); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java index 9c1622bb1b..7ae9fa2886 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java @@ -43,7 +43,7 @@ public abstract class ShardDataTreeSnapshot { * * @return An optional root node. */ - public abstract Optional> getRootNode(); + public abstract Optional getRootNode(); public abstract void serialize(ObjectOutput out) throws IOException; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java index 7b574530ee..5891c4f761 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java @@ -58,7 +58,7 @@ public class ShardStrategyFactory { return UNKNOWN_MODULE_NAME; } - String namespace = path.getPathArguments().get(0).getNodeType().getNamespace().toASCIIString(); + String namespace = path.getPathArguments().get(0).getNodeType().getNamespace().toString(); String moduleName = configuration.getModuleNameFromNameSpace(namespace); return moduleName != null ? moduleName : UNKNOWN_MODULE_NAME; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java index d859f67905..ae0938e600 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; * @author Thomas Pantelis */ public abstract class AbstractBatchedModificationsCursor extends AbstractDataTreeModificationCursor { - protected abstract BatchedModifications getModifications(); @Override @@ -30,12 +29,12 @@ public abstract class AbstractBatchedModificationsCursor extends AbstractDataTre } @Override - public final void merge(final PathArgument child, final NormalizedNode data) { + public final void merge(final PathArgument child, final NormalizedNode data) { getModifications().addModification(new MergeModification(current().node(child), data)); } @Override - public final void write(final PathArgument child, final NormalizedNode data) { + public final void write(final PathArgument child, final NormalizedNode data) { getModifications().addModification(new WriteModification(current().node(child), data)); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/DataTreeModificationOutput.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/DataTreeModificationOutput.java index 9dc308e209..c298371044 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/DataTreeModificationOutput.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/DataTreeModificationOutput.java @@ -59,16 +59,16 @@ public final class DataTreeModificationOutput { } @Override - public void merge(final PathArgument child, final NormalizedNode data) { + public void merge(final PathArgument child, final NormalizedNode data) { outputPathAndNode("MERGE", child, data); } @Override - public void write(final PathArgument child, final NormalizedNode data) { + public void write(final PathArgument child, final NormalizedNode data) { outputPathAndNode("WRITE", child, data); } - private void outputPathAndNode(final String name, final PathArgument child, final NormalizedNode data) { + private void outputPathAndNode(final String name, final PathArgument child, final NormalizedNode data) { try { output.writeByte('\n'); output.write(name.getBytes(StandardCharsets.UTF_8)); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java index 0d2f65b978..a78e36c811 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregator.java @@ -22,11 +22,11 @@ import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public final class NormalizedNodeAggregator { private final YangInstanceIdentifier rootIdentifier; - private final List>> nodes; + private final List> nodes; private final DataTree dataTree; private NormalizedNodeAggregator(final YangInstanceIdentifier rootIdentifier, - final List>> nodes, final EffectiveModelContext schemaContext, + final List> nodes, final EffectiveModelContext schemaContext, final LogicalDatastoreType logicalDatastoreType) { this.rootIdentifier = rootIdentifier; this.nodes = nodes; @@ -39,20 +39,20 @@ public final class NormalizedNodeAggregator { /** * Combine data from all the nodes in the list into a tree with root as rootIdentifier. */ - public static Optional> aggregate(final YangInstanceIdentifier rootIdentifier, - final List>> nodes, final EffectiveModelContext schemaContext, + public static Optional aggregate(final YangInstanceIdentifier rootIdentifier, + final List> nodes, final EffectiveModelContext schemaContext, final LogicalDatastoreType logicalDatastoreType) throws DataValidationFailedException { return new NormalizedNodeAggregator(rootIdentifier, nodes, schemaContext, logicalDatastoreType).aggregate(); } - private Optional> aggregate() throws DataValidationFailedException { + private Optional aggregate() throws DataValidationFailedException { return combine().getRootNode(); } private NormalizedNodeAggregator combine() throws DataValidationFailedException { final DataTreeModification mod = dataTree.takeSnapshot().newModification(); - for (final Optional> node : nodes) { + for (final Optional node : nodes) { if (node.isPresent()) { mod.merge(rootIdentifier, node.get()); } @@ -65,7 +65,7 @@ public final class NormalizedNodeAggregator { return this; } - private Optional> getRootNode() { + private Optional getRootNode() { return dataTree.takeSnapshot().readNode(rootIdentifier); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeXMLOutput.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeXMLOutput.java index 49a0f47a41..643d107865 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeXMLOutput.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeXMLOutput.java @@ -40,7 +40,7 @@ public final class NormalizedNodeXMLOutput { private NormalizedNodeXMLOutput() { } - public static void toStream(OutputStream outStream, NormalizedNode node) + public static void toStream(final OutputStream outStream, final NormalizedNode node) throws XMLStreamException, IOException { XMLStreamWriter xmlWriter = XOF.createXMLStreamWriter(outStream); @@ -53,7 +53,7 @@ public final class NormalizedNodeXMLOutput { } } - public static void toFile(File file, NormalizedNode node) { + public static void toFile(final File file, final NormalizedNode node) { try (FileOutputStream outStream = new FileOutputStream(file)) { toStream(outStream, node); } catch (IOException | XMLStreamException e) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java index f156c2fe9f..06f3a0557a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java @@ -43,12 +43,12 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } @Override - public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { pruneAndMergeNode(path, data); } @Override - public void write(final YangInstanceIdentifier path, final NormalizedNode data) { + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { pruneAndWriteNode(path, data); } @@ -71,7 +71,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } @Override - public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { if (path.isEmpty()) { pruneAndMergeNode(path, data); return; @@ -86,7 +86,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } @Override - public void write(final YangInstanceIdentifier path, final NormalizedNode data) { + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { if (path.isEmpty()) { pruneAndWriteNode(path, data); return; @@ -140,15 +140,15 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } } - final void pruneAndMergeNode(final YangInstanceIdentifier path, final NormalizedNode data) { - final NormalizedNode pruned = pruneNormalizedNode(path, data); + final void pruneAndMergeNode(final YangInstanceIdentifier path, final NormalizedNode data) { + final NormalizedNode pruned = pruneNormalizedNode(path, data); if (pruned != null) { delegate.merge(path, pruned); } } - final void pruneAndWriteNode(final YangInstanceIdentifier path, final NormalizedNode data) { - final NormalizedNode pruned = pruneNormalizedNode(path, data); + final void pruneAndWriteNode(final YangInstanceIdentifier path, final NormalizedNode data) { + final NormalizedNode pruned = pruneNormalizedNode(path, data); if (pruned != null) { delegate.write(path, pruned); } @@ -173,7 +173,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } @Override - public final Optional> readNode(final YangInstanceIdentifier yangInstanceIdentifier) { + public final Optional readNode(final YangInstanceIdentifier yangInstanceIdentifier) { return delegate.readNode(yangInstanceIdentifier); } @@ -183,8 +183,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } @VisibleForTesting - final NormalizedNode pruneNormalizedNode(final YangInstanceIdentifier path, - final NormalizedNode input) { + final NormalizedNode pruneNormalizedNode(final YangInstanceIdentifier path, final NormalizedNode input) { pruner.initializeForPath(path); try { NormalizedNodeWriter.forStreamWriter(pruner).write(input); @@ -210,18 +209,18 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple } @Override - public void write(final PathArgument child, final NormalizedNode data) { + public void write(final PathArgument child, final NormalizedNode data) { final YangInstanceIdentifier path = current().node(child); - final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); + final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); if (prunedNode != null) { toModification.write(path, prunedNode); } } @Override - public void merge(final PathArgument child, final NormalizedNode data) { + public void merge(final PathArgument child, final NormalizedNode data) { final YangInstanceIdentifier path = current().node(child); - final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); + final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); if (prunedNode != null) { toModification.merge(path, prunedNode); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java index 5bb61b0aef..c56209f268 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java @@ -28,7 +28,7 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest private ClientBackedReadTransaction object; @Mock - private NormalizedNode data; + private NormalizedNode data; @Mock private ClientActorContext clientContext; @Mock @@ -54,8 +54,8 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest @Test public void testRead() throws Exception { - final ListenableFuture>> result = object().read(YangInstanceIdentifier.empty()); - final Optional> resultData = result.get(); + final ListenableFuture> result = object().read(YangInstanceIdentifier.empty()); + final Optional resultData = result.get(); assertTrue(resultData.isPresent()); assertEquals(data, resultData.get()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java index d651d089fb..1d29ed1b80 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java @@ -31,7 +31,7 @@ public class ClientBackedReadWriteTransactionTest @Mock private ClientTransaction delegate; @Mock - private NormalizedNode data; + private NormalizedNode data; @Mock private DOMStoreThreePhaseCommitCohort readyCohort; @@ -55,8 +55,8 @@ public class ClientBackedReadWriteTransactionTest @Test public void testRead() throws Exception { - final FluentFuture>> result = object().read(YangInstanceIdentifier.empty()); - final Optional> resultData = result.get(); + final FluentFuture> result = object().read(YangInstanceIdentifier.empty()); + final Optional resultData = result.get(); assertTrue(resultData.isPresent()); assertEquals(data, resultData.get()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java index 4a6ee3f944..75b36602e7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java @@ -24,7 +24,7 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes @Mock private ClientTransaction delegate; @Mock - private NormalizedNode data; + private NormalizedNode data; @Mock private YangInstanceIdentifier path; @Mock diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java index 390dc7019d..9e8c332544 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java @@ -50,9 +50,8 @@ public class ClientSnapshotTest extends AbstractClientHandleTest @Test public void testRead() throws Exception { - final ListenableFuture>> exists = getHandle().read(PATH); + final ListenableFuture> exists = getHandle().read(PATH); verify(getDataTreeSnapshot()).readNode(PATH); assertFalse(getWithTimeout(exists).isPresent()); } - } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java index 486c07c8a8..69494f30ff 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java @@ -26,6 +26,7 @@ import org.opendaylight.controller.cluster.access.commands.TransactionCommitSucc import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; 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.api.schema.tree.CursorAwareDataTreeModification; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; @@ -35,7 +36,7 @@ public class ClientTransactionTest extends AbstractClientHandleTest DATA = Builders.containerBuilder() + private static final ContainerNode DATA = Builders.containerBuilder() .withNodeIdentifier(YangInstanceIdentifier.NodeIdentifier.create(PATH.getLastPathArgument().getNodeType())) .build(); @@ -69,9 +70,9 @@ public class ClientTransactionTest extends AbstractClientHandleTest>> resultFuture = getHandle().read(PATH); + final FluentFuture> resultFuture = getHandle().read(PATH); verify(modification).readNode(PATH); - final Optional> result = getWithTimeout(resultFuture); + final Optional result = getWithTimeout(resultFuture); assertTrue(result.isPresent()); assertEquals(DATA, result.get()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java index 497622f631..6afecf36b8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java @@ -66,9 +66,9 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest tester = getTester(); - final FluentFuture>> read = transaction.read(PATH_2); + final FluentFuture> read = transaction.read(PATH_2); final ReadTransactionRequest req = tester.expectTransactionRequest(ReadTransactionRequest.class); - final Optional> result = Optional.of(DATA_1); + final Optional result = Optional.of(DATA_1); tester.replySuccess(new ReadTransactionSuccess(TRANSACTION_ID, req.getSequence(), result)); assertFutureEquals(result, read); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractDistributedDataStoreIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractDistributedDataStoreIntegrationTest.java index cbe494f06c..f7fbb051da 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractDistributedDataStoreIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractDistributedDataStoreIntegrationTest.java @@ -154,7 +154,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { // Verify the data in the store final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); - Optional> optional = readTx.read(carPath).get(5, TimeUnit.SECONDS); + Optional optional = readTx.read(carPath).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", car, optional.get()); @@ -176,14 +176,14 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { // 2. Write some data final YangInstanceIdentifier nodePath = TestModel.TEST_PATH; - final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); readWriteTx.write(nodePath, nodeToWrite); // 3. Read the data from Tx final Boolean exists = readWriteTx.exists(nodePath).get(5, TimeUnit.SECONDS); assertEquals("exists", Boolean.TRUE, exists); - Optional> optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS); + Optional optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", nodeToWrite, optional.get()); @@ -236,7 +236,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { final Boolean exists = readWriteTx.exists(carPath).get(5, TimeUnit.SECONDS); assertEquals("exists", Boolean.TRUE, exists); - Optional> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS); + Optional optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", car, optional.get()); @@ -304,10 +304,10 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { assertTrue(frontendMetadata.getClients().get(0).getCurrentHistories().isEmpty()); } - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); - assertEquals("# cars", numCars, ((Collection) optional.get().getValue()).size()); + assertEquals("# cars", numCars, ((Collection) optional.get().body()).size()); } } @@ -445,7 +445,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { assertNotNull("newWriteOnlyTransaction returned null", writeTx); // 2. Write some data - final NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx.write(TestModel.TEST_PATH, testNode); // 3. Ready the Tx for commit @@ -471,7 +471,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { // the data from the first // Tx is visible after being readied. DOMStoreReadTransaction readTx = txChain.newReadOnlyTransaction(); - Optional> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); + Optional optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", testNode, optional.get()); @@ -544,7 +544,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { final YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack"); readWriteTx.merge(personPath, person); - Optional> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS); + Optional optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", car, optional.get()); @@ -615,10 +615,10 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { f.get(5, TimeUnit.SECONDS); } - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); - assertEquals("# cars", numCars, ((Collection) optional.get().getValue()).size()); + assertEquals("# cars", numCars, ((Collection) optional.get().body()).size()); txChain.close(); @@ -640,7 +640,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { final DOMStoreReadWriteTransaction rwTx2 = txChain.newReadWriteTransaction(); - final Optional> optional = rwTx2.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); + final Optional optional = rwTx2.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); assertFalse("isPresent", optional.isPresent()); txChain.close(); @@ -696,10 +696,10 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready(); // Create read-only tx's and issue a read. - FluentFuture>> readFuture1 = txChain + FluentFuture> readFuture1 = txChain .newReadOnlyTransaction().read(TestModel.TEST_PATH); - FluentFuture>> readFuture2 = txChain + FluentFuture> readFuture2 = txChain .newReadOnlyTransaction().read(TestModel.TEST_PATH); // Create another write tx and issue the write. @@ -872,7 +872,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { DataTree dataTree = new InMemoryDataTreeFactory().create( DataTreeConfiguration.DEFAULT_OPERATIONAL, SchemaContextHelper.full()); AbstractShardTest.writeToStore(dataTree, CarsModel.BASE_PATH, carsNode); - NormalizedNode root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.empty()); + NormalizedNode root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.empty()); final Snapshot carsSnapshot = Snapshot.create( new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)), @@ -881,7 +881,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, SchemaContextHelper.full()); - final NormalizedNode peopleNode = PeopleModel.create(); + final NormalizedNode peopleNode = PeopleModel.create(); AbstractShardTest.writeToStore(dataTree, PeopleModel.BASE_PATH, peopleNode); root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.empty()); @@ -900,7 +900,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); // two reads - Optional> optional = readTx.read(CarsModel.BASE_PATH).get(5, TimeUnit.SECONDS); + Optional optional = readTx.read(CarsModel.BASE_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", carsNode, optional.get()); @@ -925,7 +925,7 @@ public abstract class AbstractDistributedDataStoreIntegrationTest { ContainerNode rootNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(YangInstanceIdentifier.NodeIdentifier.create(SchemaContext.NAME)) - .withChild((ContainerNode) CarsModel.create()) + .withChild(CarsModel.create()) .build(); testKit.testWriteTransaction(dataStore, YangInstanceIdentifier.empty(), rootNode); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java index 7fe5e87860..8c6e841152 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java @@ -67,7 +67,6 @@ import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -158,18 +157,18 @@ public abstract class AbstractShardTest extends AbstractActorTest { // Verify data in the data store. - final NormalizedNode outerList = readStore(shard, TestModel.OUTER_LIST_PATH); + final NormalizedNode outerList = readStore(shard, TestModel.OUTER_LIST_PATH); assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList); assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable", - outerList.getValue() instanceof Iterable); - for (final Object entry: (Iterable) outerList.getValue()) { + outerList.body() instanceof Iterable); + for (final Object entry: (Iterable) outerList.body()) { assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " entry is not MapEntryNode", entry instanceof MapEntryNode); final MapEntryNode mapEntry = (MapEntryNode)entry; - final Optional> idLeaf = - mapEntry.getChild(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME)); + final Optional idLeaf = + mapEntry.findChildByArg(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME)); assertTrue("Missing leaf " + TestModel.ID_QNAME.getLocalName(), idLeaf.isPresent()); - final Object value = idLeaf.get().getValue(); + final Object value = idLeaf.get().body(); assertTrue("Unexpected value for leaf " + TestModel.ID_QNAME.getLocalName() + ": " + value, listEntryKeys.remove(value)); } @@ -273,7 +272,7 @@ public abstract class AbstractShardTest extends AbstractActorTest { } protected static BatchedModifications prepareBatchedModifications(final TransactionIdentifier transactionID, - final YangInstanceIdentifier path, final NormalizedNode data, final boolean doCommitOnReady) { + final YangInstanceIdentifier path, final NormalizedNode data, final boolean doCommitOnReady) { final MutableCompositeModification modification = new MutableCompositeModification(); modification.addModification(new WriteModification(path, data)); return prepareBatchedModifications(transactionID, modification, doCommitOnReady); @@ -281,24 +280,24 @@ public abstract class AbstractShardTest extends AbstractActorTest { protected static ForwardedReadyTransaction prepareForwardedReadyTransaction(final TestActorRef shard, final TransactionIdentifier transactionID, final YangInstanceIdentifier path, - final NormalizedNode data, final boolean doCommitOnReady) { + final NormalizedNode data, final boolean doCommitOnReady) { ReadWriteShardDataTreeTransaction rwTx = shard.underlyingActor().getDataStore() .newReadWriteTransaction(transactionID); rwTx.getSnapshot().write(path, data); return new ForwardedReadyTransaction(transactionID, CURRENT_VERSION, rwTx, doCommitOnReady, Optional.empty()); } - public static NormalizedNode readStore(final TestActorRef shard, + public static NormalizedNode readStore(final TestActorRef shard, final YangInstanceIdentifier id) { return shard.underlyingActor().getDataStore().readNode(id).orElse(null); } - public static NormalizedNode readStore(final DataTree store, final YangInstanceIdentifier id) { + public static NormalizedNode readStore(final DataTree store, final YangInstanceIdentifier id) { return store.takeSnapshot().readNode(id).orElse(null); } public void writeToStore(final TestActorRef shard, final YangInstanceIdentifier id, - final NormalizedNode node) throws InterruptedException, ExecutionException { + final NormalizedNode node) throws InterruptedException, ExecutionException { Future future = Patterns.ask(shard, newBatchedModifications(nextTransactionId(), id, node, true, true, 1), new Timeout(5, TimeUnit.SECONDS)); try { @@ -309,15 +308,15 @@ public abstract class AbstractShardTest extends AbstractActorTest { } public static void writeToStore(final ShardDataTree store, final YangInstanceIdentifier id, - final NormalizedNode node) throws DataValidationFailedException { + final NormalizedNode node) throws DataValidationFailedException { BatchedModifications batched = newBatchedModifications(nextTransactionId(), id, node, true, true, 1); DataTreeModification modification = store.getDataTree().takeSnapshot().newModification(); batched.apply(modification); store.notifyListeners(commitTransaction(store.getDataTree(), modification)); } - public static void writeToStore(final DataTree store, final YangInstanceIdentifier id, - final NormalizedNode node) throws DataValidationFailedException { + public static void writeToStore(final DataTree store, final YangInstanceIdentifier id, final NormalizedNode node) + throws DataValidationFailedException { final DataTreeModification transaction = store.takeSnapshot().newModification(); transaction.write(id, node); @@ -327,8 +326,8 @@ public abstract class AbstractShardTest extends AbstractActorTest { store.commit(candidate); } - public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id, - final NormalizedNode node) throws DataValidationFailedException { + public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id, final NormalizedNode node) + throws DataValidationFailedException { final BatchedModifications batched = new BatchedModifications(nextTransactionId(), CURRENT_VERSION); batched.addModification(new MergeModification(id, node)); batched.setReady(); @@ -346,7 +345,7 @@ public abstract class AbstractShardTest extends AbstractActorTest { writeToStore(testStore, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - final NormalizedNode root = readStore(testStore, YangInstanceIdentifier.empty()); + final NormalizedNode root = readStore(testStore, YangInstanceIdentifier.empty()); InMemorySnapshotStore.addSnapshot(shardID.toString(), Snapshot.create( new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)), @@ -363,7 +362,7 @@ public abstract class AbstractShardTest extends AbstractActorTest { } static BatchedModifications newBatchedModifications(final TransactionIdentifier transactionID, - final YangInstanceIdentifier path, final NormalizedNode data, final boolean ready, + final YangInstanceIdentifier path, final NormalizedNode data, final boolean ready, final boolean doCommitOnReady, final int messagesSent) { final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); batched.addModification(new WriteModification(path, data)); @@ -376,7 +375,7 @@ public abstract class AbstractShardTest extends AbstractActorTest { } static BatchedModifications newReadyBatchedModifications(final TransactionIdentifier transactionID, - final YangInstanceIdentifier path, final NormalizedNode data, + final YangInstanceIdentifier path, final NormalizedNode data, final SortedSet participatingShardNames) { final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); batched.addModification(new WriteModification(path, data)); @@ -387,18 +386,18 @@ public abstract class AbstractShardTest extends AbstractActorTest { @SuppressWarnings("unchecked") static void verifyOuterListEntry(final TestActorRef shard, final Object expIDValue) { - final NormalizedNode outerList = readStore(shard, TestModel.OUTER_LIST_PATH); + final NormalizedNode outerList = readStore(shard, TestModel.OUTER_LIST_PATH); assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList); assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable", - outerList.getValue() instanceof Iterable); - final Object entry = ((Iterable)outerList.getValue()).iterator().next(); + outerList.body() instanceof Iterable); + final Object entry = ((Iterable)outerList.body()).iterator().next(); assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " entry is not MapEntryNode", entry instanceof MapEntryNode); final MapEntryNode mapEntry = (MapEntryNode)entry; - final Optional> idLeaf = - mapEntry.getChild(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME)); + final Optional idLeaf = + mapEntry.findChildByArg(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME)); assertTrue("Missing leaf " + TestModel.ID_QNAME.getLocalName(), idLeaf.isPresent()); - assertEquals(TestModel.ID_QNAME.getLocalName() + " value", expIDValue, idLeaf.get().getValue()); + assertEquals(TestModel.ID_QNAME.getLocalName() + " value", expIDValue, idLeaf.get().body()); } public static DataTreeCandidateTip mockCandidate(final String name) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java index a40739f114..5143547575 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java @@ -130,9 +130,9 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { @Override public String getModuleNameFromNameSpace(final String nameSpace) { - if (TestModel.JUNK_QNAME.getNamespace().toASCIIString().equals(nameSpace)) { + if (TestModel.JUNK_QNAME.getNamespace().toString().equals(nameSpace)) { return TestModel.JUNK_QNAME.getLocalName(); - } else if (CarsModel.BASE_QNAME.getNamespace().toASCIIString().equals(nameSpace)) { + } else if (CarsModel.BASE_QNAME.getNamespace().toString().equals(nameSpace)) { return CarsModel.BASE_QNAME.getLocalName(); } return null; @@ -202,7 +202,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { final TransactionType type) { class CreateTransactionArgumentMatcher implements ArgumentMatcher { @Override - public boolean matches(CreateTransaction argument) { + public boolean matches(final CreateTransaction argument) { return argument.getTransactionId().getHistoryId().getClientId().getFrontendId().getMemberName() .getName().equals(expMemberName) && argument.getTransactionType() == type.ordinal(); } @@ -214,7 +214,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { protected DataExists eqDataExists() { class DataExistsArgumentMatcher implements ArgumentMatcher { @Override - public boolean matches(DataExists argument) { + public boolean matches(final DataExists argument) { return argument.getPath().equals(TestModel.TEST_PATH); } } @@ -229,7 +229,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { protected ReadData eqReadData(final YangInstanceIdentifier path) { class ReadDataArgumentMatcher implements ArgumentMatcher { @Override - public boolean matches(ReadData argument) { + public boolean matches(final ReadData argument) { return argument.getPath().equals(path); } } @@ -242,7 +242,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { } - protected Future readDataReply(final NormalizedNode data) { + protected Future readDataReply(final NormalizedNode data) { return Futures.successful(new ReadDataReply(data, DataStoreVersions.CURRENT_VERSION)); } @@ -470,9 +470,8 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { while (iter.hasNext()) { Object actual = iter.next(); if (CommitTransactionReply.isSerializedType(expReply) - && CommitTransactionReply.isSerializedType(actual)) { - found = true; - } else if (expReply instanceof ActorSelection && Objects.equals(expReply, actual)) { + && CommitTransactionReply.isSerializedType(actual) + || expReply instanceof ActorSelection && Objects.equals(expReply, actual)) { found = true; } else if (expReply instanceof Class && ((Class) expReply).isInstance(actual)) { found = true; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java index 7068d75a70..97b5f75f8f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java @@ -308,7 +308,7 @@ public class DataTreeCohortIntegrationTest { private static void assertDataTreeCandidate(final DOMDataTreeCandidate candidate, final DOMDataTreeIdentifier expTreeId, final ModificationType expType, - final Optional> expDataAfter, final Optional> expDataBefore) { + final Optional expDataAfter, final Optional expDataBefore) { assertNotNull("Expected candidate for path " + expTreeId.getRootIdentifier(), candidate); assertEquals("rootPath", expTreeId, candidate.getRootPath()); assertEquals("modificationType", expType, candidate.getRootNode().getModificationType()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java index 5cefc8b36d..6a7b17b316 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java @@ -126,12 +126,11 @@ public class DatastoreSnapshotRestoreTest { return new ShardManagerSnapshot(Arrays.asList(shards), Collections.emptyMap()); } - private static Snapshot newSnapshot(final YangInstanceIdentifier path, final NormalizedNode node) - throws Exception { + private static Snapshot newSnapshot(final YangInstanceIdentifier path, final NormalizedNode node) throws Exception { DataTree dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, SchemaContextHelper.full()); AbstractShardTest.writeToStore(dataTree, path, node); - NormalizedNode root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.empty()); + NormalizedNode root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.empty()); return Snapshot.create(new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)), Collections.emptyList(), 2, 1, 2, 1, 1, "member-1", null); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java index 9f88ae4c48..eb6ab93128 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java @@ -147,7 +147,7 @@ public class DistributedDataStoreIntegrationTest extends AbstractDistributedData // Verify the data in the store final DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); - Optional> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); + Optional optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS); @@ -192,7 +192,7 @@ public class DistributedDataStoreIntegrationTest extends AbstractDistributedData // Do some reads on the Tx on a separate thread. final AtomicReference> txExistsFuture = new AtomicReference<>(); - final AtomicReference>>> txReadFuture = new AtomicReference<>(); + final AtomicReference>> txReadFuture = new AtomicReference<>(); final AtomicReference caughtEx = new AtomicReference<>(); final CountDownLatch txReadsDone = new CountDownLatch(1); final Thread txThread = new Thread(() -> { @@ -324,7 +324,7 @@ public class DistributedDataStoreIntegrationTest extends AbstractDistributedData assertNotNull("newReadWriteTransaction returned null", readWriteTx); // Do a read on the Tx on a separate thread. - final AtomicReference>>> txReadFuture = new AtomicReference<>(); + final AtomicReference>> txReadFuture = new AtomicReference<>(); final AtomicReference caughtEx = new AtomicReference<>(); final CountDownLatch txReadDone = new CountDownLatch(1); final Thread txThread = new Thread(() -> { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java index 7fa19bc95f..c01949c930 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java @@ -115,13 +115,13 @@ import org.opendaylight.yangtools.yang.common.Uint64; 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.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -246,12 +246,12 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { private static void verifyCars(final DOMStoreReadTransaction readTx, final MapEntryNode... entries) throws Exception { - final Optional> optional = readTx.read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); + final Optional optional = readTx.read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); - final CollectionNodeBuilder listBuilder = ImmutableNodes.mapNodeBuilder( + final CollectionNodeBuilder listBuilder = ImmutableNodes.mapNodeBuilder( CarsModel.CAR_QNAME); - for (final NormalizedNode entry: entries) { + for (final NormalizedNode entry: entries) { listBuilder.withChild((MapEntryNode) entry); } @@ -259,8 +259,8 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { } private static void verifyNode(final DOMStoreReadTransaction readTx, final YangInstanceIdentifier path, - final NormalizedNode expNode) throws Exception { - final Optional> optional = readTx.read(path).get(5, TimeUnit.SECONDS); + final NormalizedNode expNode) throws Exception { + final Optional optional = readTx.read(path).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", expNode, optional.get()); } @@ -410,10 +410,10 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { } }); - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); - assertEquals("# cars", numCars, ((Collection) optional.get().getValue()).size()); + assertEquals("# cars", numCars, ((Collection) optional.get().body()).size()); } @Test @@ -476,10 +476,10 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { } }); - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); - assertEquals("# cars", numCars, ((Collection) optional.get().getValue()).size()); + assertEquals("# cars", numCars, ((Collection) optional.get().body()).size()); } @Test @@ -516,11 +516,11 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { assertNotNull("newWriteOnlyTransaction returned null", writeTx); final YangInstanceIdentifier carsPath = CarsModel.BASE_PATH; - final NormalizedNode carsNode = CarsModel.emptyContainer(); + final NormalizedNode carsNode = CarsModel.emptyContainer(); writeTx.write(carsPath, carsNode); final YangInstanceIdentifier peoplePath = PeopleModel.BASE_PATH; - final NormalizedNode peopleNode = PeopleModel.emptyContainer(); + final NormalizedNode peopleNode = PeopleModel.emptyContainer(); writeTx.write(peoplePath, peopleNode); followerTestKit.doCommit(writeTx.ready()); @@ -539,11 +539,11 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { assertNotNull("newReadWriteTransaction returned null", rwTx); final YangInstanceIdentifier carsPath = CarsModel.BASE_PATH; - final NormalizedNode carsNode = CarsModel.emptyContainer(); + final NormalizedNode carsNode = CarsModel.emptyContainer(); rwTx.write(carsPath, carsNode); final YangInstanceIdentifier peoplePath = PeopleModel.BASE_PATH; - final NormalizedNode peopleNode = PeopleModel.emptyContainer(); + final NormalizedNode peopleNode = PeopleModel.emptyContainer(); rwTx.write(peoplePath, peopleNode); followerTestKit.doCommit(rwTx.ready()); @@ -630,7 +630,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { final YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack"); readWriteTx.merge(personPath, person); - Optional> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS); + Optional optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", car, optional.get()); @@ -965,7 +965,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { cars.add(CarsModel.newCarEntry("car" + carIndex, Uint64.valueOf(carIndex))); writeTx2.write(CarsModel.newCarPath("car" + carIndex), cars.getLast()); carIndex++; - NormalizedNode people = ImmutableNodes.mapNodeBuilder(PeopleModel.PERSON_QNAME) + NormalizedNode people = ImmutableNodes.mapNodeBuilder(PeopleModel.PERSON_QNAME) .withChild(PeopleModel.newPersonEntry("Dude")).build(); writeTx2.write(PeopleModel.PERSON_LIST_PATH, people); final DOMStoreThreePhaseCommitCohort writeTx2Cohort = writeTx2.ready(); @@ -1340,7 +1340,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { CarsModel.newCarsMapNode(CarsModel.newCarEntry("optima", Uint64.valueOf(20000)))); AbstractShardTest.writeToStore(tree, CarsModel.BASE_PATH, carsNode); - final NormalizedNode snapshotRoot = AbstractShardTest.readStore(tree, YangInstanceIdentifier.empty()); + final NormalizedNode snapshotRoot = AbstractShardTest.readStore(tree, YangInstanceIdentifier.empty()); final Snapshot initialSnapshot = Snapshot.create( new ShardSnapshotState(new MetadataShardDataTreeSnapshot(snapshotRoot)), Collections.emptyList(), 5, 1, 5, 1, 1, null, null); @@ -1351,7 +1351,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { initDatastoresWithCars(testName); - final Optional> readOptional = leaderDistributedDataStore.newReadOnlyTransaction().read( + final Optional readOptional = leaderDistributedDataStore.newReadOnlyTransaction().read( CarsModel.BASE_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", readOptional.isPresent()); assertEquals("Node", carsNode, readOptional.get()); @@ -1374,7 +1374,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { final DOMStoreReadWriteTransaction rwTx = followerDistributedDataStore.newReadWriteTransaction(); - final NormalizedNode carsNode = CarsModel.create(); + final NormalizedNode carsNode = CarsModel.create(); rwTx.write(CarsModel.BASE_PATH, carsNode); verifyNode(rwTx, CarsModel.BASE_PATH, carsNode); @@ -1460,7 +1460,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { leaderTestKit.waitForMembersUp("member-2"); final ContainerNode rootNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(YangInstanceIdentifier.NodeIdentifier.create(SchemaContext.NAME)) - .withChild((ContainerNode) CarsModel.create()) + .withChild(CarsModel.create()) .build(); leaderTestKit.testWriteTransaction(leaderDistributedDataStore, YangInstanceIdentifier.empty(), rootNode); @@ -1512,7 +1512,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { } private static void verifySnapshot(final Snapshot actual, final Snapshot expected, - final NormalizedNode expRoot) { + final NormalizedNode expRoot) { assertEquals("Snapshot getLastAppliedTerm", expected.getLastAppliedTerm(), actual.getLastAppliedTerm()); assertEquals("Snapshot getLastAppliedIndex", expected.getLastAppliedIndex(), actual.getLastAppliedIndex()); assertEquals("Snapshot getLastTerm", expected.getLastTerm(), actual.getLastTerm()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java index 1e7da9c587..b5b3f92f59 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreWithSegmentedJournalIntegrationTest.java @@ -44,8 +44,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; @RunWith(Parameterized.class) public class DistributedDataStoreWithSegmentedJournalIntegrationTest @@ -93,7 +94,7 @@ public class DistributedDataStoreWithSegmentedJournalIntegrationTest @Test public void testManyWritesDeletes() throws Exception { final IntegrationTestKit testKit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); - CollectionNodeBuilder carMapBuilder = ImmutableNodes.mapNodeBuilder(CAR_QNAME); + CollectionNodeBuilder carMapBuilder = ImmutableNodes.mapNodeBuilder(CAR_QNAME); try (AbstractDataStore dataStore = testKit.setupAbstractDataStore( testParameter, "testManyWritesDeletes", "module-shards-cars-member-1.conf", true, "cars")) { @@ -126,7 +127,7 @@ public class DistributedDataStoreWithSegmentedJournalIntegrationTest } } - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); @@ -160,7 +161,7 @@ public class DistributedDataStoreWithSegmentedJournalIntegrationTest DOMStoreTransactionChain txChain = dataStore.createTransactionChain(); MapNode cars = carMapBuilder.build(); - final Optional> optional = txChain.newReadOnlyTransaction() + final Optional optional = txChain.newReadOnlyTransaction() .read(CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("restored cars do not match snapshot", cars, optional.get()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java index 0bf67fa45e..e205950f34 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/IntegrationTestKit.java @@ -327,7 +327,7 @@ public class IntegrationTestKit extends ShardTestKit { } void testWriteTransaction(final AbstractDataStore dataStore, final YangInstanceIdentifier nodePath, - final NormalizedNode nodeToWrite) throws Exception { + final NormalizedNode nodeToWrite) throws Exception { // 1. Create a write-only Tx @@ -350,7 +350,7 @@ public class IntegrationTestKit extends ShardTestKit { DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); - Optional> optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS); + Optional optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS); assertTrue("isPresent", optional.isPresent()); assertEquals("Data node", nodeToWrite, optional.get()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java index 42d8d79828..56713c4cf2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java @@ -63,7 +63,7 @@ public class LocalTransactionContextTest { @Test public void testWrite() { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); - NormalizedNode normalizedNode = mock(NormalizedNode.class); + NormalizedNode normalizedNode = mock(NormalizedNode.class); localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); } @@ -71,7 +71,7 @@ public class LocalTransactionContextTest { @Test public void testMerge() { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); - NormalizedNode normalizedNode = mock(NormalizedNode.class); + NormalizedNode normalizedNode = mock(NormalizedNode.class); localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); } @@ -86,7 +86,7 @@ public class LocalTransactionContextTest { @Test public void testRead() { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); - NormalizedNode normalizedNode = mock(NormalizedNode.class); + NormalizedNode normalizedNode = mock(NormalizedNode.class); doReturn(FluentFutures.immediateFluentFuture(Optional.of(normalizedNode))).when(readWriteTransaction) .read(yangInstanceIdentifier); localTransactionContext.executeRead(new ReadData(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION), @@ -118,7 +118,7 @@ public class LocalTransactionContextTest { @Test public void testReadyWithWriteError() { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); - NormalizedNode normalizedNode = mock(NormalizedNode.class); + NormalizedNode normalizedNode = mock(NormalizedNode.class); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); @@ -133,7 +133,7 @@ public class LocalTransactionContextTest { @Test public void testReadyWithMergeError() { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); - NormalizedNode normalizedNode = mock(NormalizedNode.class); + NormalizedNode normalizedNode = mock(NormalizedNode.class); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java index bd9c0a48ff..8ef0f36c3a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java @@ -555,7 +555,7 @@ public class ShardCommitCoordinationTest extends AbstractShardTest { static void verifyInnerListEntry(TestActorRef shard, int outerID, String innerID) { final YangInstanceIdentifier path = innerEntryPath(outerID, innerID); - final NormalizedNode innerListEntry = readStore(shard, path); + final NormalizedNode innerListEntry = readStore(shard, path); assertNotNull(path + " not found", innerListEntry); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 6a8635b2c2..cfb0379966 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -138,11 +138,11 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); - final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + final Optional optional = snapshot1.readNode(CarsModel.BASE_PATH); assertEquals(expectedCarsPresent, optional.isPresent()); - final Optional> optional1 = snapshot1.readNode(PeopleModel.BASE_PATH); + final Optional optional1 = snapshot1.readNode(PeopleModel.BASE_PATH); assertEquals(expectedPeoplePresent, optional1.isPresent()); } @@ -155,11 +155,11 @@ public class ShardDataTreeTest extends AbstractTest { candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); - final NormalizedNode expected = getCars(shardDataTree); + final NormalizedNode expected = getCars(shardDataTree); applyCandidates(shardDataTree, candidates); - final NormalizedNode actual = getCars(shardDataTree); + final NormalizedNode actual = getCars(shardDataTree); assertEquals(expected, actual); } @@ -174,11 +174,11 @@ public class ShardDataTreeTest extends AbstractTest { candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); - final NormalizedNode expected = getCars(shardDataTree); + final NormalizedNode expected = getCars(shardDataTree); applyCandidates(shardDataTree, candidates); - final NormalizedNode actual = getCars(shardDataTree); + final NormalizedNode actual = getCars(shardDataTree); assertEquals(expected, actual); } @@ -235,7 +235,7 @@ public class ShardDataTreeTest extends AbstractTest { final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); - NormalizedNode peopleNode = PeopleModel.create(); + NormalizedNode peopleNode = PeopleModel.create(); final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(PeopleModel.BASE_PATH, peopleNode)); @@ -313,7 +313,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(carPath); + Optional optional = snapshot.readNode(carPath); assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); @@ -360,7 +360,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(carPath); + Optional optional = snapshot.readNode(carPath); assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); } @@ -389,7 +389,7 @@ public class ShardDataTreeTest extends AbstractTest { inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(CarsModel.BASE_PATH); + Optional optional = snapshot.readNode(CarsModel.BASE_PATH); assertTrue("Car node present", optional.isPresent()); } @@ -445,7 +445,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(carPath); + Optional optional = snapshot.readNode(carPath); assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); } @@ -461,7 +461,7 @@ public class ShardDataTreeTest extends AbstractTest { final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); - NormalizedNode peopleNode = PeopleModel.create(); + NormalizedNode peopleNode = PeopleModel.create(); final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(PeopleModel.BASE_PATH, peopleNode)); @@ -485,7 +485,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - Optional> optional = snapshot.readNode(PeopleModel.BASE_PATH); + Optional optional = snapshot.readNode(PeopleModel.BASE_PATH); assertTrue("People node present", optional.isPresent()); assertEquals("People node", peopleNode, optional.get()); } @@ -556,7 +556,7 @@ public class ShardDataTreeTest extends AbstractTest { // Verify uint translation final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); + final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); assertEquals(Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) @@ -569,7 +569,7 @@ public class ShardDataTreeTest extends AbstractTest { private void assertCarsUint64() { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); - final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); + final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); assertEquals(Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) @@ -623,12 +623,12 @@ public class ShardDataTreeTest extends AbstractTest { reset(listener); } - private static NormalizedNode getCars(final ShardDataTree shardDataTree) { + private static NormalizedNode getCars(final ShardDataTree shardDataTree) { final ReadOnlyShardDataTreeTransaction readOnlyShardDataTreeTransaction = shardDataTree.newReadOnlyTransaction(nextTransactionId()); final DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); - final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + final Optional optional = snapshot1.readNode(CarsModel.BASE_PATH); assertTrue(optional.isPresent()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java index 029645cea1..31026fd79f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java @@ -100,7 +100,7 @@ public class ShardRecoveryCoordinatorTest extends AbstractTest { return dataTree.prepare(modification); } - private Optional> readCars(final ShardDataTree shardDataTree) { + private Optional readCars(final ShardDataTree shardDataTree) { final DataTree dataTree = shardDataTree.getDataTree(); // FIXME: this should not be called here dataTree.setEffectiveModelContext(peopleSchemaContext); @@ -108,7 +108,7 @@ public class ShardRecoveryCoordinatorTest extends AbstractTest { return shardDataTree.readNode(CarsModel.BASE_PATH); } - private Optional> readPeople(final ShardDataTree shardDataTree) { + private Optional readPeople(final ShardDataTree shardDataTree) { final DataTree dataTree = shardDataTree.getDataTree(); // FIXME: this should not be called here dataTree.setEffectiveModelContext(peopleSchemaContext); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java index 833f97a540..f396eae960 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java @@ -299,7 +299,7 @@ public class ShardTest extends AbstractShardTest { writeToStore(store, TestModel.TEST_PATH, container); final YangInstanceIdentifier root = YangInstanceIdentifier.empty(); - final NormalizedNode expected = readStore(store, root); + final NormalizedNode expected = readStore(store, root); final Snapshot snapshot = Snapshot.create(new ShardSnapshotState(new MetadataShardDataTreeSnapshot(expected)), Collections.emptyList(), 1, 2, 3, 4, -1, null, null); @@ -343,7 +343,7 @@ public class ShardTest extends AbstractShardTest { while (sw.elapsed(TimeUnit.SECONDS) <= 5) { Uninterruptibles.sleepUninterruptibly(75, TimeUnit.MILLISECONDS); - final NormalizedNode actual = readStore(shard, TestModel.TEST_PATH); + final NormalizedNode actual = readStore(shard, TestModel.TEST_PATH); if (actual != null) { assertEquals("Applied state", node, actual); return; @@ -748,7 +748,7 @@ public class ShardTest extends AbstractShardTest { // Verify data in the data store. - final NormalizedNode actualNode = readStore(shard, path); + final NormalizedNode actualNode = readStore(shard, path); assertEquals("Stored node", containerNode, actualNode); } @@ -838,7 +838,7 @@ public class ShardTest extends AbstractShardTest { ShardTestKit.waitUntilLeader(shard); final TransactionIdentifier transactionID = nextTransactionId(); - final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); if (readWrite) { shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, containerNode, true), testKit.getRef()); @@ -849,7 +849,7 @@ public class ShardTest extends AbstractShardTest { testKit.expectMsgClass(Duration.ofSeconds(5), CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); + final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); } @@ -882,7 +882,7 @@ public class ShardTest extends AbstractShardTest { testKit.expectMsgClass(CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); + final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); } @@ -927,7 +927,7 @@ public class ShardTest extends AbstractShardTest { shard.tell(new CommitTransaction(txId, CURRENT_VERSION).toSerializable(), testKit.getRef()); testKit.expectMsgClass(CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); + final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); } @@ -946,7 +946,7 @@ public class ShardTest extends AbstractShardTest { final Duration duration = Duration.ofSeconds(5); final TransactionIdentifier transactionID = nextTransactionId(); - final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, false), testKit.getRef()); testKit.expectMsgClass(duration, ReadyTransactionReply.class); @@ -963,7 +963,7 @@ public class ShardTest extends AbstractShardTest { shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); + final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); } @@ -1291,7 +1291,7 @@ public class ShardTest extends AbstractShardTest { shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), testKit.getRef()); testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode node = readStore(shard, TestModel.TEST_PATH); + final NormalizedNode node = readStore(shard, TestModel.TEST_PATH); // Since we're simulating an abort occurring during replication // and before finish commit, @@ -1359,7 +1359,7 @@ public class ShardTest extends AbstractShardTest { shard.tell(new CommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), testKit.getRef()); testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode node = readStore(shard, listNodePath); + final NormalizedNode node = readStore(shard, listNodePath); assertNotNull(listNodePath + " not found", node); } @@ -1519,7 +1519,7 @@ public class ShardTest extends AbstractShardTest { testKit.expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode node = readStore(shard, TestModel.TEST2_PATH); + final NormalizedNode node = readStore(shard, TestModel.TEST2_PATH); assertNotNull(TestModel.TEST2_PATH + " not found", node); } @@ -1735,7 +1735,7 @@ public class ShardTest extends AbstractShardTest { ShardTestKit.waitUntilLeader(shard); writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - final NormalizedNode expectedRoot = readStore(shard, YangInstanceIdentifier.empty()); + final NormalizedNode expectedRoot = readStore(shard, YangInstanceIdentifier.empty()); // Trigger creation of a snapshot by ensuring final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext(); @@ -1747,7 +1747,7 @@ public class ShardTest extends AbstractShardTest { } private static void awaitAndValidateSnapshot(final AtomicReference latch, - final AtomicReference savedSnapshot, final NormalizedNode expectedRoot) + final AtomicReference savedSnapshot, final NormalizedNode expectedRoot) throws InterruptedException { assertTrue("Snapshot saved", latch.get().await(5, TimeUnit.SECONDS)); @@ -1759,8 +1759,8 @@ public class ShardTest extends AbstractShardTest { savedSnapshot.set(null); } - private static void verifySnapshot(final Snapshot snapshot, final NormalizedNode expectedRoot) { - final NormalizedNode actual = ((ShardSnapshotState)snapshot.getState()).getSnapshot().getRootNode().get(); + private static void verifySnapshot(final Snapshot snapshot, final NormalizedNode expectedRoot) { + final NormalizedNode actual = ((ShardSnapshotState)snapshot.getState()).getSnapshot().getRootNode().get(); assertEquals("Root node", expectedRoot, actual); } @@ -1778,7 +1778,7 @@ public class ShardTest extends AbstractShardTest { commitTransaction(store, putTransaction); - final NormalizedNode expected = readStore(store, YangInstanceIdentifier.empty()); + final NormalizedNode expected = readStore(store, YangInstanceIdentifier.empty()); final DataTreeModification writeTransaction = store.takeSnapshot().newModification(); @@ -1787,7 +1787,7 @@ public class ShardTest extends AbstractShardTest { commitTransaction(store, writeTransaction); - final NormalizedNode actual = readStore(store, YangInstanceIdentifier.empty()); + final NormalizedNode actual = readStore(store, YangInstanceIdentifier.empty()); assertEquals(expected, actual); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java index a59abe7dd0..5097197ff3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java @@ -166,12 +166,12 @@ public class ShardTransactionTest extends AbstractActorTest { final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModifications"); YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create() + NormalizedNode writeData = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH; - NormalizedNode mergeData = ImmutableContainerNodeBuilder.create() + NormalizedNode mergeData = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)) .build(); @@ -204,7 +204,7 @@ public class ShardTransactionTest extends AbstractActorTest { watcher.watch(transaction); YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create() + NormalizedNode writeData = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); @@ -235,7 +235,7 @@ public class ShardTransactionTest extends AbstractActorTest { watcher.watch(transaction); YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create() + NormalizedNode writeData = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java index e4ad8fd054..37cdc4a019 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java @@ -133,7 +133,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { DOMStoreWriteTransaction writeTx1 = txChainProxy.newWriteOnlyTransaction(); - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx1.write(TestModel.TEST_PATH, writeNode1); writeTx1.ready(); @@ -146,7 +146,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { expectBatchedModifications(txActorRef2, 1); - final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); final DOMStoreWriteTransaction writeTx2 = txChainProxy.newWriteOnlyTransaction(); @@ -201,7 +201,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { DOMStoreWriteTransaction writeTx1 = txChainProxy.newReadWriteTransaction(); - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx1.write(TestModel.TEST_PATH, writeNode1); writeTx1.ready(); @@ -215,7 +215,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { expectBatchedModifications(txActorRef2, 1); - final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); final DOMStoreWriteTransaction writeTx2 = txChainProxy.newReadWriteTransaction(); @@ -263,7 +263,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { DOMStoreWriteTransaction writeTx1 = txChainProxy.newWriteOnlyTransaction(); - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx1.write(TestModel.TEST_PATH, writeNode1); txChainProxy.newWriteOnlyTransaction(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java index b375488af8..ce1d6f6948 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java @@ -102,12 +102,12 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { doReturn(readDataReply(null)).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), eqReadData(), any(Timeout.class)); - Optional> readOptional = transactionProxy.read( + Optional readOptional = transactionProxy.read( TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); assertFalse("NormalizedNode isPresent", readOptional.isPresent()); - NormalizedNode expectedNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode expectedNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); doReturn(readDataReply(expectedNode)).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), eqReadData(), any(Timeout.class)); @@ -190,7 +190,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { public void testReadWithPriorRecordingOperationSuccessful() throws Exception { ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE); - NormalizedNode expectedNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode expectedNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(actorRef, 1); @@ -201,7 +201,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { transactionProxy.write(TestModel.TEST_PATH, expectedNode); - Optional> readOptional = transactionProxy.read( + Optional readOptional = transactionProxy.read( TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); assertTrue("NormalizedNode isPresent", readOptional.isPresent()); @@ -299,7 +299,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { public void testExistsWithPriorRecordingOperationSuccessful() throws Exception { ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(actorRef, 1); @@ -333,7 +333,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { dataStoreContextBuilder.shardBatchedModificationCount(1); ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), WRITE_ONLY); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(actorRef, 1); @@ -360,16 +360,16 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { expectBatchedModificationsReady(actorRef); - final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); final TransactionProxy transactionProxy = new TransactionProxy(mockComponentFactory, READ_WRITE); final CountDownLatch readComplete = new CountDownLatch(1); final AtomicReference caughtEx = new AtomicReference<>(); com.google.common.util.concurrent.Futures.addCallback(transactionProxy.read(TestModel.TEST_PATH), - new FutureCallback>>() { + new FutureCallback>() { @Override - public void onSuccess(final Optional> result) { + public void onSuccess(final Optional result) { try { transactionProxy.write(TestModel.TEST_PATH, nodeToWrite); } catch (Exception e) { @@ -422,7 +422,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { dataStoreContextBuilder.shardBatchedModificationCount(1); ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), WRITE_ONLY); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(actorRef, 1); @@ -451,7 +451,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { public void testReadWrite() { ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE); - final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); doReturn(readDataReply(null)).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), eqReadData(), any(Timeout.class)); @@ -479,7 +479,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { public void testReadyWithReadWrite() { ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE); - final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); doReturn(readDataReply(null)).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), eqReadData(), any(Timeout.class)); @@ -594,7 +594,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), WRITE_ONLY); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModificationsReady(actorRef, true); @@ -620,7 +620,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { dataStoreContextBuilder.shardBatchedModificationCount(1).writeOnlyTransactionOptimizationsEnabled(true); ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), WRITE_ONLY); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModificationsReady(actorRef, true); @@ -649,7 +649,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), WRITE_ONLY); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectFailedBatchedModifications(actorRef); @@ -697,7 +697,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { expectReadyLocalTransaction(shardActorRef, true); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); transactionProxy.write(TestModel.TEST_PATH, nodeToWrite); DOMStoreThreePhaseCommitCohort ready = transactionProxy.ready(); @@ -728,7 +728,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { expectReadyLocalTransaction(shardActorRef, true); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); transactionProxy.write(TestModel.TEST_PATH, nodeToWrite); DOMStoreThreePhaseCommitCohort ready = transactionProxy.ready(); @@ -741,7 +741,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { TransactionProxy transactionProxy = new TransactionProxy(mockComponentFactory, WRITE_ONLY); - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); transactionProxy.merge(TestModel.TEST_PATH, nodeToWrite); @@ -969,7 +969,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { return dataTree; } - private static DataTree createDataTree(final NormalizedNode readResponse) { + private static DataTree createDataTree(final NormalizedNode readResponse) { DataTree dataTree = mock(DataTree.class); DataTreeSnapshot dataTreeSnapshot = mock(DataTreeSnapshot.class); DataTreeModification dataTreeModification = mock(DataTreeModification.class); @@ -985,7 +985,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testWriteCompletionForLocalShard() { completeOperationLocal(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); transactionProxy.write(TestModel.TEST_PATH, nodeToWrite); @@ -997,7 +997,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testWriteThrottlingWhenShardFound() { throttleOperation(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectIncompleteBatchedModifications(); @@ -1011,7 +1011,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { public void testWriteThrottlingWhenShardNotFound() { // Confirm that there is no throttling when the Shard is not found completeOperation(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(2); @@ -1026,7 +1026,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testWriteCompletion() { completeOperation(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(2); @@ -1039,7 +1039,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testMergeThrottlingWhenShardFound() { throttleOperation(transactionProxy -> { - NormalizedNode nodeToMerge = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToMerge = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectIncompleteBatchedModifications(); @@ -1052,7 +1052,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testMergeThrottlingWhenShardNotFound() { completeOperation(transactionProxy -> { - NormalizedNode nodeToMerge = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToMerge = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(2); @@ -1065,7 +1065,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testMergeCompletion() { completeOperation(transactionProxy -> { - NormalizedNode nodeToMerge = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToMerge = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(2); @@ -1079,7 +1079,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testMergeCompletionForLocalShard() { completeOperationLocal(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); transactionProxy.merge(TestModel.TEST_PATH, nodeToWrite); @@ -1167,7 +1167,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testReadCompletion() { completeOperation(transactionProxy -> { - NormalizedNode nodeToRead = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToRead = ImmutableNodes.containerNode(TestModel.TEST_QNAME); doReturn(readDataReply(nodeToRead)).when(mockActorContext).executeOperationAsync( any(ActorSelection.class), eqReadData(), any(Timeout.class)); @@ -1181,7 +1181,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testReadCompletionForLocalShard() { - final NormalizedNode nodeToRead = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode nodeToRead = ImmutableNodes.containerNode(TestModel.TEST_QNAME); completeOperationLocal(transactionProxy -> { transactionProxy.read(TestModel.TEST_PATH); @@ -1242,7 +1242,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testExistsCompletionForLocalShard() { - final NormalizedNode nodeToRead = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode nodeToRead = ImmutableNodes.containerNode(TestModel.TEST_QNAME); completeOperationLocal(transactionProxy -> { transactionProxy.exists(TestModel.TEST_PATH); @@ -1265,7 +1265,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { public void testReadyThrottling() { throttleOperation(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); expectBatchedModifications(1); @@ -1278,8 +1278,8 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { @Test public void testReadyThrottlingWithTwoTransactionContexts() { throttleOperation(transactionProxy -> { - NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - NormalizedNode carsNode = ImmutableNodes.containerNode(CarsModel.BASE_QNAME); + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode carsNode = ImmutableNodes.containerNode(CarsModel.BASE_QNAME); expectBatchedModifications(2); @@ -1303,22 +1303,22 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { expectBatchedModifications(actorRef, shardBatchedModificationCount); YangInstanceIdentifier writePath1 = TestModel.TEST_PATH; - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); YangInstanceIdentifier writePath2 = TestModel.OUTER_LIST_PATH; - NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); YangInstanceIdentifier writePath3 = TestModel.INNER_LIST_PATH; - NormalizedNode writeNode3 = ImmutableNodes.containerNode(TestModel.INNER_LIST_QNAME); + NormalizedNode writeNode3 = ImmutableNodes.containerNode(TestModel.INNER_LIST_QNAME); YangInstanceIdentifier mergePath1 = TestModel.TEST_PATH; - NormalizedNode mergeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode mergeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); YangInstanceIdentifier mergePath2 = TestModel.OUTER_LIST_PATH; - NormalizedNode mergeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + NormalizedNode mergeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); YangInstanceIdentifier mergePath3 = TestModel.INNER_LIST_PATH; - NormalizedNode mergeNode3 = ImmutableNodes.containerNode(TestModel.INNER_LIST_QNAME); + NormalizedNode mergeNode3 = ImmutableNodes.containerNode(TestModel.INNER_LIST_QNAME); YangInstanceIdentifier deletePath1 = TestModel.TEST_PATH; YangInstanceIdentifier deletePath2 = TestModel.OUTER_LIST_PATH; @@ -1379,16 +1379,16 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { expectBatchedModifications(actorRef, shardBatchedModificationCount); final YangInstanceIdentifier writePath1 = TestModel.TEST_PATH; - final NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); YangInstanceIdentifier writePath2 = TestModel.OUTER_LIST_PATH; - NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); final YangInstanceIdentifier mergePath1 = TestModel.TEST_PATH; - final NormalizedNode mergeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final NormalizedNode mergeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); YangInstanceIdentifier mergePath2 = TestModel.INNER_LIST_PATH; - NormalizedNode mergeNode2 = ImmutableNodes.containerNode(TestModel.INNER_LIST_QNAME); + NormalizedNode mergeNode2 = ImmutableNodes.containerNode(TestModel.INNER_LIST_QNAME); final YangInstanceIdentifier deletePath = TestModel.OUTER_LIST_PATH; @@ -1406,7 +1406,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { transactionProxy.write(writePath1, writeNode1); transactionProxy.write(writePath2, writeNode2); - Optional> readOptional = transactionProxy.read(writePath2).get(5, TimeUnit.SECONDS); + Optional readOptional = transactionProxy.read(writePath2).get(5, TimeUnit.SECONDS); assertTrue("NormalizedNode isPresent", readOptional.isPresent()); assertEquals("Response NormalizedNode", writeNode2, readOptional.get()); @@ -1463,8 +1463,8 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { doReturn(schemaContext).when(mockActorContext).getSchemaContext(); doReturn(Sets.newHashSet("test", "cars")).when(configuration).getAllShardNames(); - NormalizedNode expectedNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - NormalizedNode expectedNode2 = ImmutableNodes.containerNode(CarsModel.CARS_QNAME); + NormalizedNode expectedNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode expectedNode2 = ImmutableNodes.containerNode(CarsModel.CARS_QNAME); setUpReadData("test", NormalizedNodeAggregatorTest.getRootNode(expectedNode1, schemaContext)); setUpReadData("cars", NormalizedNodeAggregatorTest.getRootNode(expectedNode2, schemaContext)); @@ -1475,19 +1475,19 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { TransactionProxy transactionProxy = new TransactionProxy(mockComponentFactory, READ_ONLY); - Optional> readOptional = transactionProxy.read( + Optional readOptional = transactionProxy.read( YangInstanceIdentifier.empty()).get(5, TimeUnit.SECONDS); assertTrue("NormalizedNode isPresent", readOptional.isPresent()); - NormalizedNode normalizedNode = readOptional.get(); + NormalizedNode normalizedNode = readOptional.get(); - assertTrue("Expect value to be a Collection", normalizedNode.getValue() instanceof Collection); + assertTrue("Expect value to be a Collection", normalizedNode.body() instanceof Collection); @SuppressWarnings("unchecked") - Collection> collection = (Collection>) normalizedNode.getValue(); + Collection collection = (Collection) normalizedNode.body(); - for (NormalizedNode node : collection) { + for (NormalizedNode node : collection) { assertTrue("Expected " + node + " to be a ContainerNode", node instanceof ContainerNode); } @@ -1503,7 +1503,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { } - private void setUpReadData(final String shardName, final NormalizedNode expectedNode) { + private void setUpReadData(final String shardName, final NormalizedNode expectedNode) { ActorSystem actorSystem = getSystem(); ActorRef shardActorRef = getSystem().actorOf(Props.create(DoNothingActor.class)); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java index ae7c9b4963..b69c6c8662 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; public class ShardSnapshotActorTest extends AbstractActorTest { private static final InputOutputStreamFactory STREAM_FACTORY = InputOutputStreamFactory.simple(); - private static final NormalizedNode DATA = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + private static final NormalizedNode DATA = ImmutableNodes.containerNode(TestModel.TEST_QNAME); private static void testSerializeSnapshot(final String testName, final ShardDataTreeSnapshot snapshot, final boolean withInstallSnapshot) throws Exception { @@ -40,7 +40,7 @@ public class ShardSnapshotActorTest extends AbstractActorTest { final ActorRef snapshotActor = getSystem().actorOf(ShardSnapshotActor.props(STREAM_FACTORY), testName); kit.watch(snapshotActor); - final NormalizedNode expectedRoot = snapshot.getRootNode().get(); + final NormalizedNode expectedRoot = snapshot.getRootNode().get(); ByteArrayOutputStream installSnapshotStream = withInstallSnapshot ? new ByteArrayOutputStream() : null; ShardSnapshotActor.requestSnapshot(snapshotActor, snapshot, @@ -60,7 +60,7 @@ public class ShardSnapshotActorTest extends AbstractActorTest { assertEquals("Deserialized snapshot type", snapshot.getClass(), deserialized.getClass()); - final Optional> maybeNode = deserialized.getRootNode(); + final Optional maybeNode = deserialized.getRootNode(); assertTrue("isPresent", maybeNode.isPresent()); assertEquals("Root node", expectedRoot, maybeNode.get()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplBaseTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplBaseTest.java index 0eb752c394..c51fea8b58 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplBaseTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplBaseTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertNull; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; -import java.net.URI; import java.util.Collection; import java.util.Set; import org.junit.Assert; @@ -22,6 +21,7 @@ import org.junit.Test; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.shardstrategy.ModuleShardStrategy; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy; +import org.opendaylight.yangtools.yang.common.XMLNamespace; public abstract class ConfigurationImplBaseTest { private static final MemberName MEMBER_1 = MemberName.forName("member-1"); @@ -127,7 +127,7 @@ public abstract class ConfigurationImplBaseTest { @Test public void testAddModuleShardConfiguration() throws Exception { - URI namespace = new URI("urn:opendaylight:test:oven"); + XMLNamespace namespace = XMLNamespace.of("urn:opendaylight:test:oven"); String moduleName = "oven"; String shardName = "oven-shard"; String shardStrategyName = ModuleShardStrategy.NAME; @@ -146,7 +146,7 @@ public abstract class ConfigurationImplBaseTest { ImmutableSortedSet.copyOf(configuration.getMembersFromShardName(shardName))); assertEquals("getShardNameForModule", shardName, configuration.getShardNameForModule(moduleName)); assertEquals("getModuleNameFromNameSpace", moduleName, - configuration.getModuleNameFromNameSpace(namespace.toASCIIString())); + configuration.getModuleNameFromNameSpace(namespace.toString())); assertEquals("getAllShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default", shardName), ImmutableSortedSet.copyOf(configuration.getAllShardNames())); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java index fdfe522bed..1b13be7c8d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertNull; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; -import java.net.URI; import java.util.Collection; import java.util.Set; import org.junit.Assert; @@ -22,6 +21,7 @@ import org.junit.Test; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.shardstrategy.ModuleShardStrategy; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy; +import org.opendaylight.yangtools.yang.common.XMLNamespace; public class ConfigurationImplTest { private static final MemberName MEMBER_1 = MemberName.forName("member-1"); @@ -125,7 +125,7 @@ public class ConfigurationImplTest { @Test public void testAddModuleShardConfiguration() throws Exception { - URI namespace = new URI("urn:opendaylight:test:oven"); + XMLNamespace namespace = XMLNamespace.of("urn:opendaylight:test:oven"); String moduleName = "oven"; String shardName = "oven-shard"; String shardStrategyName = ModuleShardStrategy.NAME; @@ -144,7 +144,7 @@ public class ConfigurationImplTest { ImmutableSortedSet.copyOf(configuration.getMembersFromShardName(shardName))); assertEquals("getShardNameForModule", shardName, configuration.getShardNameForModule(moduleName)); assertEquals("getModuleNameFromNameSpace", moduleName, - configuration.getModuleNameFromNameSpace(namespace.toASCIIString())); + configuration.getModuleNameFromNameSpace(namespace.toString())); assertEquals("getAllShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default", shardName), ImmutableSortedSet.copyOf(configuration.getAllShardNames())); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java index 994070ce62..9258c0ee9c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java @@ -39,12 +39,12 @@ public class BatchedModificationsTest extends AbstractTest { @Test public void testSerialization() { YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH; - NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).build(); YangInstanceIdentifier deletePath = TestModel.TEST_PATH; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java index caf55737be..f01b09c716 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java @@ -30,7 +30,7 @@ public class ReadDataReplyTest { @Test public void testSerialization() { - NormalizedNode data = ImmutableContainerNodeBuilder.create() + NormalizedNode data = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java index 5d7d842298..17d05f22b7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java @@ -49,9 +49,10 @@ public abstract class AbstractModificationTest { cohort.commit(); } - protected Optional> readData(final YangInstanceIdentifier path) throws Exception { + protected Optional readData(final YangInstanceIdentifier path) throws Exception { + // FIXME: close the transaction DOMStoreReadTransaction transaction = store.newReadOnlyTransaction(); - ListenableFuture>> future = transaction.read(path); + ListenableFuture> future = transaction.read(path); return future.get(); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java index ac0d7f9388..c483d4d411 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java @@ -33,7 +33,7 @@ public class DeleteModificationTest extends AbstractModificationTest { commitTransaction(writeTransaction); // Check if it's in the datastore - Optional> data = readData(TestModel.TEST_PATH); + Optional data = readData(TestModel.TEST_PATH); Assert.assertTrue(data.isPresent()); // Delete stuff from the datastore diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java index bfdcf0edf8..5a9c88d16b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java @@ -35,7 +35,7 @@ public class MergeModificationTest extends AbstractModificationTest { commitTransaction(writeTransaction); //Check if it's in the datastore - Optional> data = readData(TestModel.TEST_PATH); + Optional data = readData(TestModel.TEST_PATH); Assert.assertTrue(data.isPresent()); } @@ -43,7 +43,7 @@ public class MergeModificationTest extends AbstractModificationTest { @Test public void testSerialization() { YangInstanceIdentifier path = TestModel.TEST_PATH; - NormalizedNode data = ImmutableContainerNodeBuilder.create() + NormalizedNode data = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java index 96438c4209..c4fcaab0e4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java @@ -35,21 +35,21 @@ public class MutableCompositeModificationTest extends AbstractModificationTest { compositeModification.apply(transaction); commitTransaction(transaction); - Optional> data = readData(TestModel.TEST_PATH); + Optional data = readData(TestModel.TEST_PATH); assertNotNull(data.get()); - assertEquals(TestModel.TEST_QNAME, data.get().getNodeType()); + assertEquals(TestModel.TEST_QNAME, data.get().getIdentifier().getNodeType()); } @Test public void testSerialization() { YangInstanceIdentifier writePath = TestModel.TEST_PATH; - NormalizedNode writeData = ImmutableContainerNodeBuilder.create() + NormalizedNode writeData = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH; - NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).build(); YangInstanceIdentifier deletePath = TestModel.TEST_PATH; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java index 5218cee1b3..7a68b542f4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java @@ -33,14 +33,14 @@ public class WriteModificationTest extends AbstractModificationTest { commitTransaction(writeTransaction); //Check if it's in the datastore - Optional> data = readData(TestModel.TEST_PATH); + Optional data = readData(TestModel.TEST_PATH); Assert.assertTrue(data.isPresent()); } @Test public void testSerialization() { YangInstanceIdentifier path = TestModel.TEST_PATH; - NormalizedNode data = ImmutableContainerNodeBuilder.create() + NormalizedNode data = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java index c081b89137..6b2156ec77 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java @@ -101,7 +101,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { public void setUp() { setUpStatic(); final YangInstanceIdentifier writePath = TestModel.TEST_PATH; - final NormalizedNode writeData = ImmutableContainerNodeBuilder.create() + final NormalizedNode writeData = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); candidate = DataTreeCandidates.fromNormalizedNode(writePath, writeData); @@ -132,7 +132,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { YangInstanceIdentifier leafSetEntryPath = YangInstanceIdentifier.builder(TestModel.TEST_PATH).node(LEAF_SET) .node(entryPathArg).build(); - NormalizedNode leafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier(entryPathArg) + NormalizedNode leafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier(entryPathArg) .withValue("one").build(); candidate = DataTreeCandidates.fromNormalizedNode(leafSetEntryPath, leafSetEntryNode); @@ -148,7 +148,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { LeafSetEntryNode leafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier(entryPathArg) .withValue("one").build(); - NormalizedNode leafSetNode = Builders.leafSetBuilder().withNodeIdentifier( + NormalizedNode leafSetNode = Builders.leafSetBuilder().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(LEAF_SET)).withChild(leafSetEntryNode).build(); candidate = DataTreeCandidates.fromNormalizedNode(leafSetPath, leafSetNode); @@ -164,7 +164,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { LeafSetEntryNode leafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier(entryPathArg) .withValue("one").build(); - NormalizedNode leafSetNode = Builders.orderedLeafSetBuilder().withNodeIdentifier( + NormalizedNode leafSetNode = Builders.orderedLeafSetBuilder().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(LEAF_SET)).withChild(leafSetEntryNode).build(); candidate = DataTreeCandidates.fromNormalizedNode(leafSetPath, leafSetNode); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java index 5adf2cb6bd..3051194a6f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java @@ -37,7 +37,7 @@ public class ShardDataTreeSnapshotTest { @Test public void testShardDataTreeSnapshotWithNoMetadata() throws Exception { - NormalizedNode expectedNode = ImmutableContainerNodeBuilder.create() + NormalizedNode expectedNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); @@ -55,7 +55,7 @@ public class ShardDataTreeSnapshotTest { deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } - Optional> actualNode = deserialized.getRootNode(); + Optional actualNode = deserialized.getRootNode(); assertTrue("rootNode present", actualNode.isPresent()); assertEquals("rootNode", expectedNode, actualNode.get()); assertEquals("Deserialized type", MetadataShardDataTreeSnapshot.class, deserialized.getClass()); @@ -64,7 +64,7 @@ public class ShardDataTreeSnapshotTest { @Test public void testShardDataTreeSnapshotWithMetadata() throws Exception { - NormalizedNode expectedNode = ImmutableContainerNodeBuilder.create() + NormalizedNode expectedNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); @@ -84,7 +84,7 @@ public class ShardDataTreeSnapshotTest { deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } - Optional> actualNode = deserialized.getRootNode(); + Optional actualNode = deserialized.getRootNode(); assertTrue("rootNode present", actualNode.isPresent()); assertEquals("rootNode", expectedNode, actualNode.get()); assertEquals("Deserialized type", MetadataShardDataTreeSnapshot.class, deserialized.getClass()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotStateTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotStateTest.java index 82b9f45565..4b324ff29b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotStateTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotStateTest.java @@ -27,7 +27,7 @@ public class ShardSnapshotStateTest { @Test public void testSerialization() { - NormalizedNode expectedNode = ImmutableContainerNodeBuilder.create() + NormalizedNode expectedNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index 1be0fa88df..4417051b09 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -46,7 +46,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import java.net.URI; import java.time.Duration; import java.util.AbstractMap; import java.util.Arrays; @@ -127,6 +126,7 @@ import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; @@ -1236,7 +1236,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .persistent(false).build(); Shard.Builder shardBuilder = Shard.builder(); - ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", + ModuleShardConfiguration config = new ModuleShardConfiguration(XMLNamespace.of("foo-ns"), "foo-module", "foo", null, members("member-1", "member-5", "member-6")); shardManager.tell(new CreateShard(config, shardBuilder, datastoreContext), kit.getRef()); @@ -1281,7 +1281,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender()); Shard.Builder shardBuilder = Shard.builder(); - ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", + ModuleShardConfiguration config = new ModuleShardConfiguration(XMLNamespace.of("foo-ns"), "foo-module", "foo", null, members("member-5", "member-6")); shardManager.tell(new CreateShard(config, shardBuilder, null), kit.getRef()); @@ -1307,7 +1307,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { Shard.Builder shardBuilder = Shard.builder(); - ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", + ModuleShardConfiguration config = new ModuleShardConfiguration(XMLNamespace.of("foo-ns"), "foo-module", "foo", null, members("member-1")); shardManager.tell(new CreateShard(config, shardBuilder, null), kit.getRef()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataTreeChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataTreeChangeListener.java index fecfc52fb6..326313eb3b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataTreeChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataTreeChangeListener.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; public class MockDataTreeChangeListener implements DOMDataTreeChangeListener { @@ -89,24 +89,24 @@ public class MockDataTreeChangeListener implements DOMDataTreeChangeListener { for (int i = 0; i < expPaths.length; i++) { final DataTreeCandidate candidate = changeList.get(i); - final Optional> maybeDataAfter = candidate.getRootNode().getDataAfter(); + final Optional maybeDataAfter = candidate.getRootNode().getDataAfter(); if (!maybeDataAfter.isPresent()) { fail(String.format("Change %d does not contain data after. Actual: %s", i + 1, candidate.getRootNode())); } - final NormalizedNode dataAfter = maybeDataAfter.get(); + final NormalizedNode dataAfter = maybeDataAfter.get(); final Optional relativePath = expPaths[i].relativeTo(candidate.getRootPath()); if (!relativePath.isPresent()) { assertEquals(String.format("Change %d does not contain %s. Actual: %s", i + 1, expPaths[i], dataAfter), expPaths[i].getLastPathArgument(), dataAfter.getIdentifier()); } else { - NormalizedNode nextChild = dataAfter; + NormalizedNode nextChild = dataAfter; for (PathArgument pathArg: relativePath.get().getPathArguments()) { boolean found = false; - if (nextChild instanceof NormalizedNodeContainer) { - Optional> maybeChild = ((NormalizedNodeContainer)nextChild) - .getChild(pathArg); + if (nextChild instanceof DistinctNodeContainer) { + Optional maybeChild = ((DistinctNodeContainer)nextChild) + .findChildByArg(pathArg); if (maybeChild.isPresent()) { found = true; nextChild = maybeChild.get(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java index cc9e9b288b..0844f3d4f3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/NormalizedNodeAggregatorTest.java @@ -39,24 +39,24 @@ public class NormalizedNodeAggregatorTest { public void testAggregate() throws InterruptedException, ExecutionException, DataValidationFailedException { EffectiveModelContext schemaContext = SchemaContextHelper.full(); - NormalizedNode expectedNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - NormalizedNode expectedNode2 = ImmutableNodes.containerNode(CarsModel.CARS_QNAME); + NormalizedNode expectedNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode expectedNode2 = ImmutableNodes.containerNode(CarsModel.CARS_QNAME); - Optional> optional = NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.empty(), + Optional optional = NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.empty(), ImmutableList.of( - Optional.>of(getRootNode(expectedNode1, schemaContext)), - Optional.>of(getRootNode(expectedNode2, schemaContext))), + Optional.of(getRootNode(expectedNode1, schemaContext)), + Optional.of(getRootNode(expectedNode2, schemaContext))), schemaContext, LogicalDatastoreType.CONFIGURATION); - NormalizedNode normalizedNode = optional.get(); + NormalizedNode normalizedNode = optional.get(); - assertTrue("Expect value to be a Collection", normalizedNode.getValue() instanceof Collection); + assertTrue("Expect value to be a Collection", normalizedNode.body() instanceof Collection); @SuppressWarnings("unchecked") - Collection> collection = (Collection>) normalizedNode.getValue(); + Collection collection = (Collection) normalizedNode.body(); - for (NormalizedNode node : collection) { + for (NormalizedNode node : collection) { assertTrue("Expected " + node + " to be a ContainerNode", node instanceof ContainerNode); } @@ -72,14 +72,14 @@ public class NormalizedNodeAggregatorTest { } - public static NormalizedNode getRootNode(final NormalizedNode moduleNode, + public static NormalizedNode getRootNode(final NormalizedNode moduleNode, final EffectiveModelContext schemaContext) throws ExecutionException, InterruptedException { try (InMemoryDOMDataStore store = new InMemoryDOMDataStore("test", Executors.newSingleThreadExecutor())) { store.onModelContextUpdated(schemaContext); DOMStoreWriteTransaction writeTransaction = store.newWriteOnlyTransaction(); - writeTransaction.merge(YangInstanceIdentifier.of(moduleNode.getNodeType()), moduleNode); + writeTransaction.merge(YangInstanceIdentifier.of(moduleNode.getIdentifier().getNodeType()), moduleNode); DOMStoreThreePhaseCommitCohort ready = writeTransaction.ready(); @@ -89,18 +89,18 @@ public class NormalizedNodeAggregatorTest { DOMStoreReadTransaction readTransaction = store.newReadOnlyTransaction(); - FluentFuture>> read = readTransaction.read(YangInstanceIdentifier.empty()); + FluentFuture> read = readTransaction.read(YangInstanceIdentifier.empty()); - Optional> nodeOptional = read.get(); + Optional nodeOptional = read.get(); return nodeOptional.get(); } } - public static NormalizedNode findChildWithQName(final Collection> collection, + public static NormalizedNode findChildWithQName(final Collection collection, final QName qname) { - for (NormalizedNode node : collection) { - if (node.getNodeType().equals(qname)) { + for (NormalizedNode node : collection) { + if (node.getIdentifier().getNodeType().equals(qname)) { return node; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModificationTest.java index abcabff8e5..1f5f92c03c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModificationTest.java @@ -123,7 +123,7 @@ public class PruningDataTreeModificationTest { @Test public void testMerge() { - NormalizedNode normalizedNode = CarsModel.create(); + NormalizedNode normalizedNode = CarsModel.create(); YangInstanceIdentifier path = CarsModel.BASE_PATH; pruningDataTreeModification.merge(path, normalizedNode); @@ -132,7 +132,7 @@ public class PruningDataTreeModificationTest { @Test public void testMergeWithInvalidNamespace() throws DataValidationFailedException { - NormalizedNode normalizedNode = PeopleModel.emptyContainer(); + NormalizedNode normalizedNode = PeopleModel.emptyContainer(); YangInstanceIdentifier path = PeopleModel.BASE_PATH; pruningDataTreeModification.merge(path, normalizedNode); @@ -149,7 +149,7 @@ public class PruningDataTreeModificationTest { new YangInstanceIdentifier.NodeIdentifier(AUG_CONTAINER)).withChild( ImmutableNodes.containerNode(AUG_INNER_CONTAINER)).build(); - DataContainerChild outerNode = outerNode(outerNodeEntry(1, innerNode("one", "two"))); + DataContainerChild outerNode = outerNode(outerNodeEntry(1, innerNode("one", "two"))); ContainerNode normalizedNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode) .withChild(augContainer).withChild(ImmutableNodes.leafNode(AUG_QNAME, "aug")).build(); @@ -163,14 +163,14 @@ public class PruningDataTreeModificationTest { ContainerNode prunedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode).build(); - Optional> actual = dataTree.takeSnapshot().readNode(path); + Optional actual = dataTree.takeSnapshot().readNode(path); assertTrue("After pruning present", actual.isPresent()); assertEquals("After pruning", prunedNode, actual.get()); } @Test public void testMergeWithValidNamespaceAndInvalidNodeName() throws DataValidationFailedException { - NormalizedNode normalizedNode = ImmutableNodes.containerNode(INVALID_TEST_QNAME); + NormalizedNode normalizedNode = ImmutableNodes.containerNode(INVALID_TEST_QNAME); YangInstanceIdentifier path = INVALID_TEST_PATH; pruningDataTreeModification.merge(path, normalizedNode); @@ -183,7 +183,7 @@ public class PruningDataTreeModificationTest { @Test public void testWrite() { - NormalizedNode normalizedNode = CarsModel.create(); + NormalizedNode normalizedNode = CarsModel.create(); YangInstanceIdentifier path = CarsModel.BASE_PATH; pruningDataTreeModification.write(path, normalizedNode); @@ -201,11 +201,11 @@ public class PruningDataTreeModificationTest { localDataTree.validate(mod); localDataTree.commit(localDataTree.prepare(mod)); - NormalizedNode normalizedNode = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()).get(); + NormalizedNode normalizedNode = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()).get(); pruningDataTreeModification.write(YangInstanceIdentifier.empty(), normalizedNode); dataTree.commit(getCandidate()); - Optional> actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()); + Optional actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()); assertTrue("Root present", actual.isPresent()); assertEquals("Root node", normalizedNode, actual.get()); } @@ -215,15 +215,15 @@ public class PruningDataTreeModificationTest { final Shard mockShard = Mockito.mock(Shard.class); ShardDataTree shardDataTree = new ShardDataTree(mockShard, SCHEMA_CONTEXT, TreeType.CONFIGURATION); - NormalizedNode root = shardDataTree.readNode(YangInstanceIdentifier.empty()).get(); + NormalizedNode root = shardDataTree.readNode(YangInstanceIdentifier.empty()).get(); - NormalizedNode normalizedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(root.getNodeType())).withChild( + NormalizedNode normalizedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + new YangInstanceIdentifier.NodeIdentifier(root.getIdentifier().getNodeType())).withChild( ImmutableNodes.containerNode(AUG_CONTAINER)).build(); pruningDataTreeModification.write(YangInstanceIdentifier.empty(), normalizedNode); dataTree.commit(getCandidate()); - Optional> actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()); + Optional actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()); assertEquals("Root present", true, actual.isPresent()); assertEquals("Root node", root, actual.get()); @@ -231,7 +231,7 @@ public class PruningDataTreeModificationTest { @Test public void testWriteWithInvalidNamespace() throws DataValidationFailedException { - NormalizedNode normalizedNode = PeopleModel.emptyContainer(); + NormalizedNode normalizedNode = PeopleModel.emptyContainer(); YangInstanceIdentifier path = PeopleModel.BASE_PATH; pruningDataTreeModification.write(path, normalizedNode); @@ -248,7 +248,7 @@ public class PruningDataTreeModificationTest { new YangInstanceIdentifier.NodeIdentifier(AUG_CONTAINER)).withChild( ImmutableNodes.containerNode(AUG_INNER_CONTAINER)).build(); - DataContainerChild outerNode = outerNode(outerNodeEntry(1, innerNode("one", "two"))); + DataContainerChild outerNode = outerNode(outerNodeEntry(1, innerNode("one", "two"))); ContainerNode normalizedNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode) .withChild(augContainer).withChild(ImmutableNodes.leafNode(AUG_QNAME, "aug")) @@ -264,7 +264,7 @@ public class PruningDataTreeModificationTest { .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode) .withChild(ImmutableNodes.leafNode(NAME_QNAME, "name")).build(); - Optional> actual = dataTree.takeSnapshot().readNode(path); + Optional actual = dataTree.takeSnapshot().readNode(path); assertTrue("After pruning present", actual.isPresent()); assertEquals("After pruning", prunedNode, actual.get()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CarsModel.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CarsModel.java index c93dbccff5..0722fcdbae 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CarsModel.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CarsModel.java @@ -14,8 +14,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeBuilder; @@ -35,13 +36,12 @@ public final class CarsModel { } - public static NormalizedNode create() { + public static ContainerNode create() { // Create a list builder - CollectionNodeBuilder cars = + CollectionNodeBuilder cars = ImmutableMapNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier( - CAR_QNAME)); + new YangInstanceIdentifier.NodeIdentifier(CAR_QNAME)); // Create an entry for the car altima MapEntryNode altima = @@ -67,7 +67,7 @@ public final class CarsModel { } - public static NormalizedNode createEmptyCarsList() { + public static NormalizedNode createEmptyCarsList() { return newCarsNode(newCarsMapNode()); } @@ -77,7 +77,7 @@ public final class CarsModel { } public static MapNode newCarsMapNode(final MapEntryNode... carEntries) { - CollectionNodeBuilder builder = ImmutableMapNodeBuilder.create() + CollectionNodeBuilder builder = ImmutableMapNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CAR_QNAME)); for (MapEntryNode e : carEntries) { builder.withChild(e); @@ -86,13 +86,13 @@ public final class CarsModel { return builder.build(); } - public static NormalizedNode emptyContainer() { + public static ContainerNode emptyContainer() { return ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(BASE_QNAME)) .build(); } - public static NormalizedNode newCarMapNode() { + public static SystemMapNode newCarMapNode() { return ImmutableNodes.mapNodeBuilder(CAR_QNAME).build(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CompositeModel.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CompositeModel.java index 27576adea6..0e041e0af5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CompositeModel.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/CompositeModel.java @@ -24,11 +24,11 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; +import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; @@ -153,7 +153,7 @@ public final class CompositeModel { final DataContainerNodeBuilder familyContainerBuilder = ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(FAMILY_QNAME)); - final CollectionNodeBuilder childrenBuilder = mapNodeBuilder(CHILDREN_QNAME); + final CollectionNodeBuilder childrenBuilder = mapNodeBuilder(CHILDREN_QNAME); final DataContainerNodeBuilder firstChildBuilder = mapEntryBuilder(CHILDREN_QNAME, CHILD_NUMBER_QNAME, FIRST_CHILD_ID); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/PeopleModel.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/PeopleModel.java index 33ee0a38af..2672943685 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/PeopleModel.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/PeopleModel.java @@ -9,11 +9,11 @@ package org.opendaylight.controller.md.cluster.datastore.model; 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.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeBuilder; @@ -33,10 +33,10 @@ public final class PeopleModel { } - public static NormalizedNode create() { + public static ContainerNode create() { // Create a list builder - CollectionNodeBuilder cars = + CollectionNodeBuilder cars = ImmutableMapNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier( PERSON_QNAME)); @@ -65,14 +65,14 @@ public final class PeopleModel { } - public static NormalizedNode emptyContainer() { + public static ContainerNode emptyContainer() { return ImmutableContainerNodeBuilder.create() .withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(BASE_QNAME)) .build(); } - public static NormalizedNode newPersonMapNode() { + public static SystemMapNode newPersonMapNode() { return ImmutableNodes.mapNodeBuilder(PERSON_QNAME).build(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java index b7f5d0fc24..5555b887d2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java @@ -12,10 +12,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -60,12 +60,12 @@ public final class TestModel { return YangParserTestUtils.parseYangResource(DATASTORE_TEST_YANG); } - public static DataContainerChild outerMapNode() { + public static DataContainerChild outerMapNode() { return ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME).build(); } - public static DataContainerChild outerNode(final int... ids) { - CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME); + public static DataContainerChild outerNode(final int... ids) { + CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME); for (int id: ids) { outer.addChild(ImmutableNodes.mapEntry(OUTER_LIST_QNAME, ID_QNAME, id)); } @@ -73,8 +73,8 @@ public final class TestModel { return outer.build(); } - public static DataContainerChild outerNode(final MapEntryNode... entries) { - CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME); + public static DataContainerChild outerNode(final MapEntryNode... entries) { + CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME); for (MapEntryNode e: entries) { outer.addChild(e); } @@ -82,8 +82,8 @@ public final class TestModel { return outer.build(); } - public static DataContainerChild innerNode(final String... names) { - CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(INNER_LIST_QNAME); + public static DataContainerChild innerNode(final String... names) { + CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(INNER_LIST_QNAME); for (String name: names) { outer.addChild(ImmutableNodes.mapEntry(INNER_LIST_QNAME, NAME_QNAME, name)); } @@ -91,15 +91,15 @@ public final class TestModel { return outer.build(); } - public static MapEntryNode outerNodeEntry(final int id, final DataContainerChild inner) { + public static MapEntryNode outerNodeEntry(final int id, final DataContainerChild inner) { return ImmutableNodes.mapEntryBuilder(OUTER_LIST_QNAME, ID_QNAME, id).addChild(inner).build(); } - public static NormalizedNode testNodeWithOuter(final int... ids) { + public static NormalizedNode testNodeWithOuter(final int... ids) { return testNodeWithOuter(outerNode(ids)); } - public static NormalizedNode testNodeWithOuter(final DataContainerChild outer) { + public static NormalizedNode testNodeWithOuter(final DataContainerChild outer) { return ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outer).build(); } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnerChangeListener.java index f7d1da7853..eb81e992d0 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnerChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnerChangeListener.java @@ -28,7 +28,6 @@ public abstract class AbstractEntityOwnerChangeListener implements DOMDataTreeCh } protected static String extractOwner(final LeafNode ownerLeaf) { - return ownerLeaf.getValue().toString(); + return ownerLeaf.body().toString(); } - } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipService.java index f1fe8d7ed5..5a519d4289 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipService.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipService.java @@ -45,7 +45,6 @@ import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListenerRegistration; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.clustering.entity.owners.rev150804.EntityOwners; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -185,7 +184,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ return Optional.empty(); } - Optional> entityNode = dataTree.takeSnapshot().readNode( + Optional entityNode = dataTree.takeSnapshot().readNode( entityPath(forEntity.getType(), forEntity.getIdentifier())); if (!entityNode.isPresent()) { return Optional.empty(); @@ -193,17 +192,16 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ // Check if there are any candidates, if there are none we do not really have ownership state final MapEntryNode entity = (MapEntryNode) entityNode.get(); - final Optional> optionalCandidates = - entity.getChild(CANDIDATE_NODE_ID); + final Optional optionalCandidates = entity.findChildByArg(CANDIDATE_NODE_ID); final boolean hasCandidates = optionalCandidates.isPresent() - && ((MapNode) optionalCandidates.get()).getValue().size() > 0; + && ((MapNode) optionalCandidates.get()).body().size() > 0; if (!hasCandidates) { return Optional.empty(); } MemberName localMemberName = context.getCurrentMemberName(); - Optional> ownerLeaf = entity.getChild(ENTITY_OWNER_NODE_ID); - String owner = ownerLeaf.isPresent() ? ownerLeaf.get().getValue().toString() : null; + Optional ownerLeaf = entity.findChildByArg(ENTITY_OWNER_NODE_ID); + String owner = ownerLeaf.isPresent() ? ownerLeaf.get().body().toString() : null; boolean hasOwner = !Strings.isNullOrEmpty(owner); boolean isOwner = hasOwner && localMemberName.getName().equals(owner); diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java index af45b7833b..509e53cc9f 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java @@ -52,7 +52,7 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener { String newOwner = extractOwner(ownerLeaf); String origOwner = null; - Optional> dataBefore = changeRoot.getDataBefore(); + Optional dataBefore = changeRoot.getDataBefore(); if (dataBefore.isPresent()) { origOwner = extractOwner((LeafNode) changeRoot.getDataBefore().get()); } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnersModel.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnersModel.java index 6670389156..14da8aed87 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnersModel.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnersModel.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableOrderedMapNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUserMapNodeBuilder; /** * Utility methods for entity-owners yang model. @@ -75,7 +75,7 @@ public final class EntityOwnersModel { return NodeIdentifierWithPredicates.of(Candidate.QNAME, CANDIDATE_NAME_QNAME, candidateName); } - static NormalizedNode entityOwnersWithCandidate(final String entityType, + static NormalizedNode entityOwnersWithCandidate(final String entityType, final YangInstanceIdentifier entityId, final String candidateName) { return entityOwnersWithEntityTypeEntry(entityTypeEntryWithEntityEntry(entityType, entityEntryWithCandidateEntry(entityId, candidateName))); @@ -100,7 +100,7 @@ public final class EntityOwnersModel { } static MapNode candidateEntry(final String candidateName) { - return ImmutableOrderedMapNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(Candidate.QNAME)) + return ImmutableUserMapNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(Candidate.QNAME)) .addChild(candidateMapEntry(candidateName)).build(); } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipShard.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipShard.java index 42ac18ef4a..64d497b62f 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipShard.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipShard.java @@ -69,7 +69,6 @@ import org.opendaylight.controller.cluster.raft.RaftState; import org.opendaylight.controller.cluster.raft.VotingState; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -174,7 +173,7 @@ class EntityOwnershipShard extends Shard { private void onRegisterCandidateLocal(final RegisterCandidateLocal registerCandidate) { LOG.debug("{}: onRegisterCandidateLocal: {}", persistenceId(), registerCandidate); - NormalizedNode entityOwners = entityOwnersWithCandidate(registerCandidate.getEntity().getType(), + NormalizedNode entityOwners = entityOwnersWithCandidate(registerCandidate.getEntity().getType(), registerCandidate.getEntity().getIdentifier(), localMemberName.getName()); commitCoordinator.commitModification(new MergeModification(ENTITY_OWNERS_PATH, entityOwners), this); @@ -200,15 +199,16 @@ class EntityOwnershipShard extends Shard { getSender().tell(SuccessReply.INSTANCE, getSelf()); searchForEntities((entityTypeNode, entityNode) -> { - Optional> possibleType = entityTypeNode.getChild(ENTITY_TYPE_NODE_ID); - String entityType = possibleType.isPresent() ? possibleType.get().getValue().toString() : null; + String entityType = entityTypeNode.findChildByArg(ENTITY_TYPE_NODE_ID) + .map(child -> child.body().toString()) + .orElse(null); if (registerListener.getEntityType().equals(entityType)) { final boolean hasOwner; final boolean isOwner; - Optional> possibleOwner = entityNode.getChild(ENTITY_OWNER_NODE_ID); + Optional possibleOwner = entityNode.findChildByArg(ENTITY_OWNER_NODE_ID); if (possibleOwner.isPresent()) { - isOwner = localMemberName.getName().equals(possibleOwner.get().getValue().toString()); + isOwner = localMemberName.getName().equals(possibleOwner.get().body().toString()); hasOwner = true; } else { isOwner = false; @@ -216,7 +216,7 @@ class EntityOwnershipShard extends Shard { } DOMEntity entity = new DOMEntity(entityType, - (YangInstanceIdentifier) entityNode.getChild(ENTITY_ID_NODE_ID).get().getValue()); + (YangInstanceIdentifier) entityNode.findChildByArg(ENTITY_ID_NODE_ID).get().body()); listenerSupport.notifyEntityOwnershipListener(entity, false, isOwner, hasOwner, registerListener.getListener()); @@ -300,22 +300,22 @@ class EntityOwnershipShard extends Shard { private void notifyAllListeners() { searchForEntities((entityTypeNode, entityNode) -> { - Optional> possibleType = entityTypeNode.getChild(ENTITY_TYPE_NODE_ID); + Optional possibleType = entityTypeNode.findChildByArg(ENTITY_TYPE_NODE_ID); if (possibleType.isPresent()) { final boolean hasOwner; final boolean isOwner; - Optional> possibleOwner = entityNode.getChild(ENTITY_OWNER_NODE_ID); + Optional possibleOwner = entityNode.findChildByArg(ENTITY_OWNER_NODE_ID); if (possibleOwner.isPresent()) { - isOwner = localMemberName.getName().equals(possibleOwner.get().getValue().toString()); + isOwner = localMemberName.getName().equals(possibleOwner.get().body().toString()); hasOwner = true; } else { isOwner = false; hasOwner = false; } - DOMEntity entity = new DOMEntity(possibleType.get().getValue().toString(), - (YangInstanceIdentifier) entityNode.getChild(ENTITY_ID_NODE_ID).get().getValue()); + DOMEntity entity = new DOMEntity(possibleType.get().body().toString(), + (YangInstanceIdentifier) entityNode.findChildByArg(ENTITY_ID_NODE_ID).get().body()); listenerSupport.notifyEntityOwnershipListeners(entity, isOwner, isOwner, hasOwner); } @@ -390,7 +390,7 @@ class EntityOwnershipShard extends Shard { .node(ENTITY_OWNER_NODE_ID).build(); Optional possibleOwner = - entityNode.getChild(ENTITY_OWNER_NODE_ID).map(node -> node.getValue().toString()); + entityNode.findChildByArg(ENTITY_OWNER_NODE_ID).map(node -> node.body().toString()); String newOwner = newOwner(possibleOwner.orElse(null), getCandidateNames(entityNode), getEntityOwnerElectionStrategy(entityPath)); @@ -544,11 +544,11 @@ class EntityOwnershipShard extends Shard { } private static Collection getCandidateNames(final MapEntryNode entity) { - return entity.getChild(CANDIDATE_NODE_ID).map(child -> { - Collection candidates = ((MapNode) child).getValue(); + return entity.findChildByArg(CANDIDATE_NODE_ID).map(child -> { + Collection candidates = ((MapNode) child).body(); Collection candidateNames = new ArrayList<>(candidates.size()); for (MapEntryNode candidate: candidates) { - candidateNames.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString()); + candidateNames.add(candidate.findChildByArg(CANDIDATE_NAME_NODE_ID).get().body().toString()); } return candidateNames; }).orElse(ImmutableList.of()); @@ -558,9 +558,9 @@ class EntityOwnershipShard extends Shard { LOG.debug("{}: Searching for entities owned by {}", persistenceId(), ownedBy); searchForEntities((entityTypeNode, entityNode) -> { - Optional> possibleOwner = - entityNode.getChild(ENTITY_OWNER_NODE_ID); - String currentOwner = possibleOwner.isPresent() ? possibleOwner.get().getValue().toString() : ""; + String currentOwner = entityNode.findChildByArg(ENTITY_OWNER_NODE_ID) + .map(child -> child.body().toString()) + .orElse(""); if (ownedBy.contains(currentOwner)) { walker.onEntity(entityTypeNode, entityNode); } @@ -587,25 +587,25 @@ class EntityOwnershipShard extends Shard { } private static boolean hasCandidate(final MapEntryNode entity, final MemberName candidateName) { - return entity.getChild(CANDIDATE_NODE_ID) - .flatMap(child -> ((MapNode)child).getChild(candidateNodeKey(candidateName.getName()))) + return entity.findChildByArg(CANDIDATE_NODE_ID) + .flatMap(child -> ((MapNode)child).findChildByArg(candidateNodeKey(candidateName.getName()))) .isPresent(); } private void searchForEntities(final EntityWalker walker) { - Optional> possibleEntityTypes = getDataStore().readNode(ENTITY_TYPES_PATH); + Optional possibleEntityTypes = getDataStore().readNode(ENTITY_TYPES_PATH); if (!possibleEntityTypes.isPresent()) { return; } - for (MapEntryNode entityType : ((MapNode) possibleEntityTypes.get()).getValue()) { - Optional> possibleEntities = entityType.getChild(ENTITY_NODE_ID); + for (MapEntryNode entityType : ((MapNode) possibleEntityTypes.get()).body()) { + Optional possibleEntities = entityType.findChildByArg(ENTITY_NODE_ID); if (!possibleEntities.isPresent()) { // shouldn't happen but handle anyway continue; } - for (MapEntryNode entity: ((MapNode) possibleEntities.get()).getValue()) { + for (MapEntryNode entity: ((MapNode) possibleEntities.get()).body()) { walker.onEntity(entityType, entity); } } @@ -669,7 +669,7 @@ class EntityOwnershipShard extends Shard { private String getCurrentOwner(final YangInstanceIdentifier entityId) { return getDataStore().readNode(entityId.node(ENTITY_OWNER_QNAME)) - .map(owner -> owner.getValue().toString()) + .map(owner -> owner.body().toString()) .orElse(null); } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java index 6f0f9c3bdf..0f2a4ec82c 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java @@ -31,7 +31,8 @@ class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener { private final TrieMap> statistics = TrieMap.create(); - EntityOwnershipStatistics(){ + EntityOwnershipStatistics() { + // Hidden on purpose } @Override @@ -45,7 +46,7 @@ class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener { updateStatistics(entityType, newOwner, 1); } - Optional> dataBefore = changeRoot.getDataBefore(); + Optional dataBefore = changeRoot.getDataBefore(); if (dataBefore.isPresent()) { String origOwner = extractOwner((LeafNode) changeRoot.getDataBefore().get()); if (!Strings.isNullOrEmpty(origOwner)) { diff --git a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnershipTest.java b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnershipTest.java index 71c9073187..7fbe4d5d73 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnershipTest.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/AbstractEntityOwnershipTest.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.cluster.entityownership; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.argThat; @@ -30,7 +32,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; -import org.junit.Assert; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.AbstractActorTest; import org.opendaylight.controller.cluster.datastore.AbstractShardTest; @@ -47,7 +48,6 @@ 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.YangInstanceIdentifier.NodeIdentifierWithPredicates; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode; @@ -73,7 +73,7 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { private static final AtomicInteger NEXT_SHARD_NUM = new AtomicInteger(); - protected void verifyEntityCandidate(final NormalizedNode node, final String entityType, + protected void verifyEntityCandidate(final NormalizedNode node, final String entityType, final YangInstanceIdentifier entityId, final String candidateName, final boolean expectPresent) { try { assertNotNull("Missing " + EntityOwners.QNAME.toString(), node); @@ -94,12 +94,12 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { } protected void verifyEntityCandidate(final String entityType, final YangInstanceIdentifier entityId, - final String candidateName, final Function> reader, + final String candidateName, final Function reader, final boolean expectPresent) { AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) { - NormalizedNode node = reader.apply(ENTITY_OWNERS_PATH); + NormalizedNode node = reader.apply(ENTITY_OWNERS_PATH); try { verifyEntityCandidate(node, entityType, entityId, candidateName, expectPresent); return; @@ -113,14 +113,13 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { } protected void verifyEntityCandidate(final String entityType, final YangInstanceIdentifier entityId, - final String candidateName, final Function> reader) { + final String candidateName, final Function reader) { verifyEntityCandidate(entityType, entityId, candidateName, reader, true); } - protected MapEntryNode getMapEntryNodeChild(final DataContainerNode parent, + protected MapEntryNode getMapEntryNodeChild(final DataContainerNode parent, final QName childMap, final QName child, final Object key, final boolean expectPresent) { - Optional> childNode = - parent.getChild(new NodeIdentifier(childMap)); + Optional childNode = parent.findChildByArg(new NodeIdentifier(childMap)); // We have to account for empty maps disappearing. If we expect the entry to be non-present, tolerate a missing // map. if (!expectPresent && !childNode.isPresent()) { @@ -130,10 +129,10 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { assertTrue("Missing " + childMap.toString(), childNode.isPresent()); MapNode entityTypeMapNode = (MapNode) childNode.get(); - Optional entityTypeEntry = entityTypeMapNode.getChild(NodeIdentifierWithPredicates.of( + Optional entityTypeEntry = entityTypeMapNode.findChildByArg(NodeIdentifierWithPredicates.of( childMap, child, key)); if (expectPresent && !entityTypeEntry.isPresent()) { - fail("Missing " + childMap.toString() + " entry for " + key + ". Actual: " + entityTypeMapNode.getValue()); + fail("Missing " + childMap.toString() + " entry for " + key + ". Actual: " + entityTypeMapNode.body()); } else if (!expectPresent && entityTypeEntry.isPresent()) { fail("Found unexpected " + childMap.toString() + " entry for " + key); } @@ -142,15 +141,15 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { } static void verifyOwner(final String expected, final String entityType, final YangInstanceIdentifier entityId, - final Function> reader) { + final Function reader) { AssertionError lastError = null; YangInstanceIdentifier entityPath = entityPath(entityType, entityId).node(ENTITY_OWNER_QNAME); Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) { try { - NormalizedNode node = reader.apply(entityPath); - Assert.assertNotNull("Owner was not set for entityId: " + entityId, node); - Assert.assertEquals("Entity owner", expected, node.getValue().toString()); + NormalizedNode node = reader.apply(entityPath); + assertNotNull("Owner was not set for entityId: " + entityId, node); + assertEquals("Entity owner", expected, node.body().toString()); return; } catch (AssertionError e) { lastError = e; @@ -174,13 +173,12 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { } protected void verifyNodeRemoved(final YangInstanceIdentifier path, - final Function> reader) { + final Function reader) { AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) { try { - NormalizedNode node = reader.apply(path); - Assert.assertNull("Node was not removed at path: " + path, node); + assertNull("Node was not removed at path: " + path, reader.apply(path)); return; } catch (AssertionError e) { lastError = e; @@ -191,7 +189,7 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { throw lastError; } - static void writeNode(final YangInstanceIdentifier path, final NormalizedNode node, + static void writeNode(final YangInstanceIdentifier path, final NormalizedNode node, final ShardDataTree shardDataTree) throws DataValidationFailedException { DataTreeModification modification = shardDataTree.newModification(); modification.merge(path, node); @@ -235,9 +233,9 @@ public class AbstractEntityOwnershipTest extends AbstractActorTest { final YangInstanceIdentifier entityId) { YangInstanceIdentifier entityPath = entityPath(entityType, entityId).node(ENTITY_OWNER_QNAME); try { - NormalizedNode node = AbstractShardTest.readStore(shard, entityPath); + NormalizedNode node = AbstractShardTest.readStore(shard, entityPath); if (node != null) { - Assert.fail("Owner " + node.getValue() + " was set for " + entityPath); + fail("Owner " + node.body() + " was set for " + entityPath); } } catch (Exception e) { diff --git a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListenerTest.java b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListenerTest.java index ce71923841..24cfca69a9 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListenerTest.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListenerTest.java @@ -106,7 +106,7 @@ public class CandidateListChangeListenerTest extends AbstractActorTest { ImmutableSet.copyOf(candidateRemoved.getRemainingCandidates())); } - private void writeNode(final YangInstanceIdentifier path, final NormalizedNode node) + private void writeNode(final YangInstanceIdentifier path, final NormalizedNode node) throws DataValidationFailedException { AbstractEntityOwnershipTest.writeNode(path, node, shardDataTree); } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipIntegrationTest.java b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipIntegrationTest.java index d8eb685435..bcef25ee33 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/DistributedEntityOwnershipIntegrationTest.java @@ -848,14 +848,14 @@ public class DistributedEntityOwnershipIntegrationTest { AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.MILLISECONDS) <= 10000) { - Optional> possible = dataStore.newReadOnlyTransaction() + Optional possible = dataStore.newReadOnlyTransaction() .read(entityPath(entity.getType(), entity.getIdentifier()).node(Candidate.QNAME)) .get(5, TimeUnit.SECONDS); try { assertTrue("Candidates not found for " + entity, possible.isPresent()); Collection actual = new ArrayList<>(); - for (MapEntryNode candidate: ((MapNode)possible.get()).getValue()) { - actual.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString()); + for (MapEntryNode candidate: ((MapNode)possible.get()).body()) { + actual.add(candidate.findChildByArg(CANDIDATE_NAME_NODE_ID).get().body().toString()); } assertEquals("Candidates for " + entity, Arrays.asList(expCandidates), actual); diff --git a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListenerTest.java b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListenerTest.java index ccfbbbb4cd..6eb5847e2b 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListenerTest.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListenerTest.java @@ -136,7 +136,7 @@ public class EntityOwnerChangeListenerTest { anyBoolean(), anyBoolean()); } - private void writeNode(final YangInstanceIdentifier path, final NormalizedNode node) + private void writeNode(final YangInstanceIdentifier path, final NormalizedNode node) throws DataValidationFailedException { AbstractEntityOwnershipTest.writeNode(path, node, shardDataTree); } diff --git a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatisticsTest.java b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatisticsTest.java index b81f67752e..4ef77e5cdc 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatisticsTest.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/test/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatisticsTest.java @@ -139,7 +139,7 @@ public class EntityOwnershipStatisticsTest extends AbstractActorTest { assertEquals(val, statistics.get(ENTITY_TYPE).get(memberName).longValue()); } - private void writeNode(final YangInstanceIdentifier path, final NormalizedNode node) + private void writeNode(final YangInstanceIdentifier path, final NormalizedNode node) throws DataValidationFailedException { AbstractEntityOwnershipTest.writeNode(path, node, shardDataTree); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java index a7370490dc..67da0963ee 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java @@ -27,7 +27,7 @@ final class RemoteRpcImplementation extends AbstractRemoteImplementation invokeRpc(final DOMRpcIdentifier rpc, - final NormalizedNode input) { + final NormalizedNode input) { return new RemoteDOMRpcFuture(rpc.getType(), ask(ExecuteRpc.from(rpc, input))); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractExecute.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractExecute.java index e9e04b2bda..613d986d7e 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractExecute.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractExecute.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * An abstract base class for invocation requests. Specialized via {@link ExecuteAction} and {@link ExecuteRpc}. */ -public abstract class AbstractExecute> implements Serializable { +public abstract class AbstractExecute implements Serializable { private static final long serialVersionUID = 1L; private final transient @NonNull T type; diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractResponse.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractResponse.java index 17897532ec..b18449378d 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractResponse.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/AbstractResponse.java @@ -14,7 +14,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * An abstract base class for invocation responses. Specialized via {@link ActionResponse} and {@link RpcResponse}. */ -public abstract class AbstractResponse> implements Serializable { +public abstract class AbstractResponse implements Serializable { private static final long serialVersionUID = 1L; private final transient @Nullable T output; 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 d6a23583aa..145f86fba4 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 @@ -68,7 +68,7 @@ public class ActionResponse extends AbstractResponse { public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { @SuppressWarnings("unchecked") final ImmutableList errors = (ImmutableList) in.readObject(); - final Optional> output = SerializationUtils.readNormalizedNode(in); + final Optional output = SerializationUtils.readNormalizedNode(in); actionResponse = new ActionResponse(output.map(ContainerNode.class::cast), errors); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java index 881a58775c..873c5b8901 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java @@ -22,15 +22,15 @@ 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; -public final class ExecuteRpc extends AbstractExecute> { +public final class ExecuteRpc extends AbstractExecute { private static final long serialVersionUID = 1128904894827335676L; - private ExecuteRpc(final @NonNull QName type, final @Nullable NormalizedNode input) { + private ExecuteRpc(final @NonNull QName type, final @Nullable NormalizedNode input) { super(type, input); } public static @NonNull ExecuteRpc from(final @NonNull DOMRpcIdentifier rpc, - final @Nullable NormalizedNode input) { + final @Nullable NormalizedNode input) { return new ExecuteRpc(rpc.getType(), input); } @@ -67,7 +67,7 @@ public final class ExecuteRpc extends AbstractExecute input = stream.readOptionalNormalizedNode().orElse(null); + final NormalizedNode input = stream.readOptionalNormalizedNode().orElse(null); executeRpc = new ExecuteRpc(type, input); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java index f141f09b3c..97a5155140 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java @@ -15,10 +15,10 @@ import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -public class RpcResponse extends AbstractResponse> { +public class RpcResponse extends AbstractResponse { private static final long serialVersionUID = -4211279498688989245L; - public RpcResponse(final @Nullable NormalizedNode output) { + public RpcResponse(final @Nullable NormalizedNode output) { super(output); } 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 7a7d32c981..a3e336f307 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 @@ -137,7 +137,7 @@ public class AbstractOpsTest { } } - static void assertCompositeNodeEquals(final NormalizedNode exp, final NormalizedNode actual) { + static void assertCompositeNodeEquals(final NormalizedNode exp, final NormalizedNode actual) { assertEquals(exp, actual); } @@ -162,8 +162,7 @@ public class AbstractOpsTest { applicationTag, info, causeMsg); } - static void assertSuccessfulRpcResult(final DOMRpcResult rpcResult, - final NormalizedNode expOutput) { + static void assertSuccessfulRpcResult(final DOMRpcResult rpcResult, final NormalizedNode expOutput) { assertNotNull("RpcResult was null", rpcResult); assertCompositeNodeEquals(expOutput, rpcResult.getResult()); } 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 b2a70be9d3..679a19c78f 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 @@ -51,9 +51,9 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { final ContainerNode rpcOutput = makeRPCOutput("bar"); final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput); - final NormalizedNode invokeRpcInput = makeRPCInput("foo"); + final NormalizedNode invokeRpcInput = makeRPCInput("foo"); @SuppressWarnings({"unchecked", "rawtypes"}) - final ArgumentCaptor> inputCaptor = + final ArgumentCaptor inputCaptor = ArgumentCaptor.forClass(NormalizedNode.class); doReturn(FluentFutures.immediateFluentFuture(rpcResult)).when(domRpcService2) @@ -73,7 +73,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { public void testInvokeAction() throws Exception { final ContainerNode actionOutput = makeRPCOutput("bar"); final DOMActionResult actionResult = new SimpleDOMActionResult(actionOutput, Collections.emptyList()); - final NormalizedNode invokeActionInput = makeRPCInput("foo"); + final NormalizedNode invokeActionInput = makeRPCInput("foo"); @SuppressWarnings({"unchecked", "rawtypes"}) final ArgumentCaptor inputCaptor = ArgumentCaptor.forClass(ContainerNode.class); @@ -96,7 +96,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput); @SuppressWarnings({"unchecked", "rawtypes"}) - final ArgumentCaptor> inputCaptor = + final ArgumentCaptor inputCaptor = (ArgumentCaptor) ArgumentCaptor.forClass(NormalizedNode.class); doReturn(FluentFutures.immediateFluentFuture(rpcResult)).when(domRpcService2) @@ -139,9 +139,9 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { final ContainerNode rpcOutput = null; final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput); - final NormalizedNode invokeRpcInput = makeRPCInput("foo"); + final NormalizedNode invokeRpcInput = makeRPCInput("foo"); @SuppressWarnings({"unchecked", "rawtypes"}) - final ArgumentCaptor> inputCaptor = + final ArgumentCaptor inputCaptor = (ArgumentCaptor) ArgumentCaptor.forClass(NormalizedNode.class); doReturn(FluentFutures.immediateFluentFuture(rpcResult)).when(domRpcService2) @@ -160,9 +160,9 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { @SuppressWarnings({"checkstyle:AvoidHidingCauseException", "checkstyle:IllegalThrows"}) @Test(expected = DOMRpcException.class) public void testInvokeRpcWithRemoteFailedFuture() throws Throwable { - final NormalizedNode invokeRpcInput = makeRPCInput("foo"); + final NormalizedNode invokeRpcInput = makeRPCInput("foo"); @SuppressWarnings({"unchecked", "rawtypes"}) - final ArgumentCaptor> inputCaptor = + final ArgumentCaptor inputCaptor = (ArgumentCaptor) ArgumentCaptor.forClass(NormalizedNode.class); when(domRpcService2.invokeRpc(eq(TEST_RPC), inputCaptor.capture())).thenReturn( @@ -211,7 +211,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { @Ignore @Test(expected = RemoteDOMRpcException.class) public void testInvokeRpcWithAkkaTimeoutException() throws Exception { - final NormalizedNode invokeRpcInput = makeRPCInput("foo"); + final NormalizedNode invokeRpcInput = makeRPCInput("foo"); final ListenableFuture frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput); assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture); @@ -225,7 +225,7 @@ public class RemoteOpsImplementationTest extends AbstractOpsTest { @Test(expected = DOMRpcException.class) @SuppressWarnings({"checkstyle:AvoidHidingCauseException", "checkstyle:IllegalThrows"}) public void testInvokeRpcWithLookupException() throws Throwable { - final NormalizedNode invokeRpcInput = makeRPCInput("foo"); + final NormalizedNode invokeRpcInput = makeRPCInput("foo"); doThrow(new RuntimeException("test")).when(domRpcService2).invokeRpc(any(QName.class), any(NormalizedNode.class)); 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 867d9a8700..3ab51193df 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 @@ -27,7 +27,6 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; import com.typesafe.config.ConfigFactory; -import java.net.URI; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -376,7 +375,7 @@ public class ActionRegistryTest { final int nRoutes = 500; final Collection added = new ArrayList<>(nRoutes); for (int i = 0; i < nRoutes; i++) { - QName type = QName.create(URI.create("/mockaction"), "mockaction" + routeIdCounter++); + QName type = QName.create("/mockaction", "mockaction" + routeIdCounter++); final DOMActionInstance routeId = DOMActionInstance.of(Absolute.of(type), LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(type))); added.add(routeId); @@ -412,7 +411,7 @@ public class ActionRegistryTest { } private List createRouteIds() { - QName type = QName.create(URI.create("/mockaction"), "mockaction" + routeIdCounter++); + QName type = QName.create("/mockaction", "mockaction" + routeIdCounter++); List routeIds = new ArrayList<>(1); routeIds.add(DOMActionInstance.of(Absolute.of(type), LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(type)))); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java index d552ad5f12..563bde4b14 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java @@ -27,7 +27,6 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; import com.typesafe.config.ConfigFactory; -import java.net.URI; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -369,7 +368,7 @@ public class RpcRegistryTest { final int nRoutes = 500; final Collection added = new ArrayList<>(nRoutes); for (int i = 0; i < nRoutes; i++) { - final DOMRpcIdentifier routeId = DOMRpcIdentifier.create(QName.create(URI.create("/mockrpc"), "type" + i)); + final DOMRpcIdentifier routeId = DOMRpcIdentifier.create(QName.create("/mockrpc", "type" + i)); added.add(routeId); //Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); @@ -402,7 +401,7 @@ public class RpcRegistryTest { } private List createRouteIds() { - QName type = QName.create(URI.create("/mockrpc"), "mockrpc" + routeIdCounter++); + QName type = QName.create("/mockrpc", "mockrpc" + routeIdCounter++); List routeIds = new ArrayList<>(1); routeIds.add(DOMRpcIdentifier.create(type)); return routeIds; 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 2129ab6283..b090205c36 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 - 8.1.1 + 9.0.1 diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index d0d85b687d..21195940de 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 - 8.1.1 + 9.0.1 diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java index 1b55dbac58..bd27bcf0df 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java @@ -20,7 +20,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -41,14 +40,14 @@ public class CarEntryDataTreeCommitCohort implements DOMDataTreeCommitCohort { private static final NodeIdentifier YEAR_NODE_ID = new NodeIdentifier(YEAR_QNAME); @Override - public FluentFuture canCommit(Object txId, SchemaContext ctx, - Collection candidates) { + public FluentFuture canCommit(final Object txId, final SchemaContext ctx, + final Collection candidates) { for (DOMDataTreeCandidate candidate : candidates) { // Simple data validation - verify the year, if present, is >= 1990 final DataTreeCandidateNode rootNode = candidate.getRootNode(); - final Optional> dataAfter = rootNode.getDataAfter(); + final Optional dataAfter = rootNode.getDataAfter(); LOG.info("In canCommit: modificationType: {}, dataBefore: {}, dataAfter: {}", rootNode.getModificationType(), rootNode.getDataBefore(), dataAfter); @@ -57,18 +56,17 @@ public class CarEntryDataTreeCommitCohort implements DOMDataTreeCommitCohort { // ModificationType because dataAfter will not be present. Also dataAfter *should* always contain a // MapEntryNode but we verify anyway. if (dataAfter.isPresent()) { - final NormalizedNode normalizedNode = dataAfter.get(); + final NormalizedNode normalizedNode = dataAfter.get(); Verify.verify(normalizedNode instanceof DataContainerNode, "Expected type DataContainerNode, actual was %s", normalizedNode.getClass()); - DataContainerNode entryNode = (DataContainerNode) normalizedNode; - final Optional> possibleYear = - entryNode.getChild(YEAR_NODE_ID); + DataContainerNode entryNode = (DataContainerNode) normalizedNode; + final Optional possibleYear = entryNode.findChildByArg(YEAR_NODE_ID); if (possibleYear.isPresent()) { - final Number year = (Number) possibleYear.get().getValue(); + final Number year = (Number) possibleYear.get().body(); LOG.info("year is {}", year); - if (!(year.longValue() >= 1990)) { + if ((year.longValue() < 1990)) { return FluentFutures.immediateFailedFluentFuture(new DataValidationFailedException( DOMDataTreeIdentifier.class, candidate.getRootPath(), String.format("Invalid year %d - year must be >= 1990", year))); 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 abd725ebac..dd85b968b7 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 @@ -440,7 +440,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService } try (DOMDataTreeReadTransaction rTx = domDataBroker.newReadOnlyTransaction()) { - final Optional> readResult = rTx.read(LogicalDatastoreType.CONFIGURATION, + final Optional readResult = rTx.read(LogicalDatastoreType.CONFIGURATION, WriteTransactionsHandler.ID_INT_YID).get(); if (!readResult.isPresent()) { diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java index 87e4dd6cce..d6c39f1996 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.clustering.it.provider.impl; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import java.net.URI; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration; @@ -19,6 +18,7 @@ import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; +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.NormalizedNode; @@ -31,7 +31,8 @@ public final class GetConstantService implements DOMRpcImplementation { private static final Logger LOG = LoggerFactory.getLogger(GetConstantService.class); private static final QNameModule MODULE = QNameModule.create( - URI.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")).intern(); + XMLNamespace.of("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")) + .intern(); private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern(); private static final QName CONSTANT = QName.create(MODULE, "constant").intern(); @@ -51,7 +52,7 @@ public final class GetConstantService implements DOMRpcImplementation { } @Override - public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) { + public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) { LOG.debug("get-constant invoked, current value: {}", constant); return Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableContainerNodeBuilder.create() 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 14e728d286..72a8a02b5e 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 @@ -36,7 +36,7 @@ public class IdIntsListener implements ClusteredDOMDataTreeChangeListener { private static final Logger LOG = LoggerFactory.getLogger(IdIntsListener.class); private static final long SECOND_AS_NANO = 1000000000; - private volatile NormalizedNode localCopy; + private volatile NormalizedNode localCopy; private final AtomicLong lastNotifTimestamp = new AtomicLong(0); private ScheduledExecutorService executorService; private ScheduledFuture scheduledFuture; @@ -70,12 +70,12 @@ public class IdIntsListener implements ClusteredDOMDataTreeChangeListener { return localCopy != null; } - public boolean checkEqual(final NormalizedNode expected) { + public boolean checkEqual(final NormalizedNode expected) { return localCopy.equals(expected); } @SuppressFBWarnings("BC_UNCONFIRMED_CAST") - public String diffWithLocalCopy(final NormalizedNode expected) { + public String diffWithLocalCopy(final NormalizedNode expected) { return diffNodes((MapNode)expected, (MapNode)localCopy); } @@ -94,9 +94,9 @@ public class IdIntsListener implements ClusteredDOMDataTreeChangeListener { final YangInstanceIdentifier.NodeIdentifier itemNodeId = new YangInstanceIdentifier.NodeIdentifier(ITEM); Map expIdIntMap = new HashMap<>(); - expected.getValue().forEach(node -> expIdIntMap.put(node.getIdentifier(), node)); + expected.body().forEach(node -> expIdIntMap.put(node.getIdentifier(), node)); - actual.getValue().forEach(actIdInt -> { + actual.body().forEach(actIdInt -> { final MapEntryNode expIdInt = expIdIntMap.remove(actIdInt.getIdentifier()); if (expIdInt == null) { builder.append('\n').append(" Unexpected id-int entry for ").append(actIdInt.getIdentifier()); @@ -104,10 +104,10 @@ public class IdIntsListener implements ClusteredDOMDataTreeChangeListener { } Map expItemMap = new HashMap<>(); - ((MapNode)expIdInt.getChild(itemNodeId).get()).getValue() + ((MapNode)expIdInt.findChildByArg(itemNodeId).get()).body() .forEach(node -> expItemMap.put(node.getIdentifier(), node)); - ((MapNode)actIdInt.getChild(itemNodeId).get()).getValue().forEach(actItem -> { + ((MapNode)actIdInt.findChildByArg(itemNodeId).get()).body().forEach(actItem -> { final MapEntryNode expItem = expItemMap.remove(actItem.getIdentifier()); if (expItem == null) { builder.append('\n').append(" Unexpected item entry ").append(actItem.getIdentifier()) 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 4dd3cdff33..72888cd10d 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 @@ -9,7 +9,6 @@ package org.opendaylight.controller.clustering.it.provider.impl; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import java.net.URI; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; @@ -21,6 +20,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -34,7 +34,8 @@ public final class RoutedGetConstantService implements DOMRpcImplementation { private static final Logger LOG = LoggerFactory.getLogger(RoutedGetConstantService.class); private static final QNameModule MODULE = QNameModule.create( - URI.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")).intern(); + XMLNamespace.of("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")) + .intern(); private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern(); private static final QName CONSTANT = QName.create(MODULE, "constant").intern(); private static final QName GET_CONTEXTED_CONSTANT = QName.create(MODULE, "get-contexted-constant").intern(); @@ -58,7 +59,7 @@ public final class RoutedGetConstantService implements DOMRpcImplementation { } @Override - public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) { + public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) { LOG.debug("get-contexted-constant invoked, current value: {}", constant); return Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableContainerNodeBuilder.create() 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 b9df997997..31d002268c 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 @@ -9,7 +9,6 @@ package org.opendaylight.controller.clustering.it.provider.impl; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import java.net.URI; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration; @@ -23,6 +22,7 @@ import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; +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.NormalizedNode; @@ -36,7 +36,8 @@ public final class SingletonGetConstantService implements DOMRpcImplementation, private static final Logger LOG = LoggerFactory.getLogger(SingletonGetConstantService.class); private static final QNameModule MODULE = QNameModule.create( - URI.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")).intern(); + XMLNamespace.of("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")) + .intern(); private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern(); private static final QName CONSTANT = QName.create(MODULE, "constant").intern(); private static final QName CONTEXT = QName.create(MODULE, "context").intern(); @@ -64,7 +65,7 @@ public final class SingletonGetConstantService implements DOMRpcImplementation, } @Override - public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) { + public ListenableFuture invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode input) { LOG.debug("get-singleton-constant invoked, current value: {}", constant); return Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableContainerNodeBuilder.create() diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java index 00d7f73d1b..6354f8497f 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java @@ -40,8 +40,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; +import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; +import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -180,7 +181,7 @@ public abstract class WriteTransactionsHandler extends AbstractTransactionHandle LOG.debug("Filling the item list with initial values."); - final CollectionNodeBuilder mapBuilder = ImmutableNodes.mapNodeBuilder(ITEM); + final CollectionNodeBuilder mapBuilder = ImmutableNodes.mapNodeBuilder(ITEM); final YangInstanceIdentifier itemListId = idListItem.node(ITEM); tx = domDataBroker.newWriteOnlyTransaction(); diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 40d9ebecf7..03772a5099 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 diff --git a/pom.xml b/pom.xml index dc14d0bac5..ec9c6b4609 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.1 -- 2.36.6