From 66e553f2098ea61426c4a441be57395673535c2f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 30 Aug 2019 11:10:53 +0200 Subject: [PATCH] Migrate from YangInstanceIdentifier.EMPTY This migrates to the replacement empty() method. Change-Id: I32ca026a33835edb16f8e1e6142e9192c880076b Signed-off-by: Robert Varga --- .../AbstractReadTransactionRequestTest.java | 2 +- .../ModifyTransactionRequestBuilderTest.java | 2 +- .../ModifyTransactionRequestTest.java | 6 ++-- .../client/ConnectedClientConnectionTest.java | 2 +- .../BindingDOMRpcProviderServiceAdapter.java | 2 +- .../AbstractDataTreeModificationCursor.java | 2 +- .../utils/stream/SerializationUtilsTest.java | 4 +-- .../transformer/NormalizedNodePrunerTest.java | 2 +- .../actors/dds/ClientTransactionCursor.java | 2 +- .../cluster/datastore/DatastoreContext.java | 2 +- .../cluster/datastore/ShardDataTree.java | 12 ++++---- .../cluster/datastore/TransactionProxy.java | 4 +-- .../datastore/config/ConfigurationImpl.java | 4 +-- .../shardstrategy/DefaultShardStrategy.java | 2 +- .../shardstrategy/ModuleShardStrategy.java | 2 +- .../utils/PruningDataTreeModification.java | 4 +-- .../DistributedShardedDOMDataTree.java | 7 +++-- .../sharding/PrefixedShardConfigWriter.java | 2 +- .../sharding/ShardedDataTreeActor.java | 2 +- .../ClientBackedReadTransactionTest.java | 8 ++--- .../ClientBackedReadWriteTransactionTest.java | 8 ++--- .../ConcurrentDOMDataBrokerTest.java | 30 +++++++++---------- .../actors/dds/AbstractClientHandleTest.java | 2 +- .../actors/dds/AbstractClientHistoryTest.java | 2 +- .../AbstractDataStoreClientBehaviorTest.java | 8 ++--- .../actors/dds/ClientSnapshotTest.java | 2 +- .../dds/ModuleShardBackendResolverTest.java | 10 +++---- ...ctDistributedDataStoreIntegrationTest.java | 4 +-- .../cluster/datastore/AbstractShardTest.java | 4 +-- .../AbstractTransactionProxyTest.java | 4 +-- .../datastore/DataTreeCohortActorTest.java | 5 ++-- .../DatastoreSnapshotRestoreTest.java | 2 +- ...butedDataStoreRemotingIntegrationTest.java | 2 +- .../FrontendReadWriteTransactionTest.java | 4 +-- .../LocalTransactionContextTest.java | 16 +++++----- .../ShardRecoveryCoordinatorTest.java | 2 +- .../cluster/datastore/ShardTest.java | 16 +++++----- .../ShardTransactionFailureTest.java | 12 ++++---- .../datastore/ShardTransactionTest.java | 4 +-- .../SimpleShardDataTreeCohortTest.java | 4 +-- .../datastore/TransactionProxyTest.java | 4 +-- .../utils/NormalizedNodeAggregatorTest.java | 4 +-- .../PruningDataTreeModificationTest.java | 12 ++++---- .../DistributedShardFrontendTest.java | 2 +- ...ributedShardedDOMDataTreeRemotingTest.java | 4 +-- .../DistributedShardedDOMDataTreeTest.java | 10 +++---- .../md/sal/dom/api/DOMRpcIdentifier.java | 2 +- .../impl/GlobalDOMRpcRoutingTableEntry.java | 4 +-- .../impl/RoutedDOMRpcRoutingTableEntry.java | 4 +-- .../InMemoryDOMStoreTreeChangePublisher.java | 4 +-- .../RemoteActionRegistryMXBeanImplTest.java | 2 +- .../RemoteRpcRegistryMXBeanImplTest.java | 2 +- .../it/provider/impl/PrefixShardHandler.java | 4 +-- 53 files changed, 137 insertions(+), 135 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java index c5cfd28319..f1fe2c08f9 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java @@ -14,7 +14,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public abstract class AbstractReadTransactionRequestTest> extends AbstractTransactionRequestTest { - protected static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; + protected static final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty(); protected static final boolean SNAPSHOT_ONLY = true; @Override 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 a546e28194..f7f88ed022 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 @@ -39,7 +39,7 @@ public class ModifyTransactionRequestBuilderTest { private final NormalizedNode node = Builders.containerBuilder().withNodeIdentifier( YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build(); private final TransactionModification transactionModification = - new TransactionWrite(YangInstanceIdentifier.EMPTY, node); + new TransactionWrite(YangInstanceIdentifier.empty(), node); private final ModifyTransactionRequestBuilder modifyTransactionRequestBuilder = new ModifyTransactionRequestBuilder(transactionIdentifier, actorRef); 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 8aef274757..d0e8401d98 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 @@ -26,7 +26,7 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build(); private static final List MODIFICATIONS = Lists.newArrayList( - new TransactionWrite(YangInstanceIdentifier.EMPTY, NODE)); + new TransactionWrite(YangInstanceIdentifier.empty(), NODE)); private static final PersistenceProtocol PROTOCOL = PersistenceProtocol.ABORT; @@ -76,7 +76,7 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest Assert.assertNotNull(casted.getModifications()); Assert.assertEquals(1, casted.getModifications().size()); final TransactionModification modification = casted.getModifications().get(0); - Assert.assertEquals(YangInstanceIdentifier.EMPTY, modification.getPath()); + Assert.assertEquals(YangInstanceIdentifier.empty(), modification.getPath()); Assert.assertEquals(TYPE_WRITE, modification.getType()); } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectedClientConnectionTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectedClientConnectionTest.java index ab80513f34..1af656b341 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectedClientConnectionTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectedClientConnectionTest.java @@ -70,7 +70,7 @@ public class ConnectedClientConnectionTest new TransactionIdentifier(new LocalHistoryIdentifier(CLIENT_ID, 0L), 0L); ModifyTransactionRequestBuilder reqBuilder = new ModifyTransactionRequestBuilder(identifier, replyToProbe.ref()); - reqBuilder.addModification(new TransactionWrite(YangInstanceIdentifier.EMPTY, Builders.containerBuilder() + reqBuilder.addModification(new TransactionWrite(YangInstanceIdentifier.empty(), Builders.containerBuilder() .withNodeIdentifier(YangInstanceIdentifier.NodeIdentifier.create( QName.create("namespace", "localName"))).build())); reqBuilder.setSequence(0L); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java index 568c4bf916..9047094103 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; @Deprecated public class BindingDOMRpcProviderServiceAdapter { - private static final Set GLOBAL = ImmutableSet.of(YangInstanceIdentifier.EMPTY); + private static final Set GLOBAL = ImmutableSet.of(YangInstanceIdentifier.empty()); private final BindingToNormalizedNodeCodec codec; private final DOMRpcProviderService domRpcRegistry; 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 74b55cf32d..1f5259eb82 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 @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification */ @Beta public abstract class AbstractDataTreeModificationCursor implements DataTreeModificationCursor { - private YangInstanceIdentifier current = YangInstanceIdentifier.EMPTY; + private YangInstanceIdentifier current = YangInstanceIdentifier.empty(); protected final YangInstanceIdentifier current() { return current; 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 a3e574c9c0..ad548340e3 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 @@ -145,7 +145,7 @@ public class SerializationUtilsTest { final LeafNode stringLeaf = createLeaf("stringLeaf", "stringValue"); final LeafNode longStringLeaf = createLeaf("longStringLeaf", getLongString()); final LeafNode qNameLeaf = createLeaf("stringLeaf", QName.create("base", "qName")); - final LeafNode idLeaf = createLeaf("stringLeaf", YangInstanceIdentifier.EMPTY); + final LeafNode idLeaf = createLeaf("stringLeaf", YangInstanceIdentifier.empty()); final MapEntryNode entry1 = Builders.mapEntryBuilder() .withNodeIdentifier(listId("mapNode", "key", "key1")) .withChild(stringLeaf) @@ -249,4 +249,4 @@ public class SerializationUtilsTest { } return builder.toString(); } -} \ No newline at end of file +} 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 47150420b4..f15b184513 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 @@ -151,7 +151,7 @@ public class NormalizedNodePrunerTest { count.incrementAndGet(); } } - }).navigate(YangInstanceIdentifier.EMPTY.toString(), normalizedNode); + }).navigate(YangInstanceIdentifier.empty().toString(), normalizedNode); return count.get(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java index 933d4bb47b..8c32a597dc 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; * @author Robert Varga */ final class ClientTransactionCursor implements DOMDataTreeWriteCursor { - private YangInstanceIdentifier current = YangInstanceIdentifier.EMPTY; + private YangInstanceIdentifier current = YangInstanceIdentifier.empty(); private final ClientTransaction parent; ClientTransactionCursor(final ClientTransaction parent) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java index 7d3d1b1089..57443bc729 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java @@ -85,7 +85,7 @@ public class DatastoreContext implements ClientActorConfig { private long transactionCreationInitialRateLimit = DEFAULT_TX_CREATION_INITIAL_RATE_LIMIT; private String dataStoreName = UNKNOWN_DATA_STORE_TYPE; private LogicalDatastoreType logicalStoreType = LogicalDatastoreType.OPERATIONAL; - private YangInstanceIdentifier storeRoot = YangInstanceIdentifier.EMPTY; + private YangInstanceIdentifier storeRoot = YangInstanceIdentifier.empty(); private int shardBatchedModificationCount = DEFAULT_SHARD_BATCHED_MODIFICATION_COUNT; private boolean writeOnlyTransactionOptimizationsEnabled = true; private long shardCommitQueueExpiryTimeoutInMillis = DEFAULT_SHARD_COMMIT_QUEUE_EXPIRY_TIMEOUT_IN_MS; 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 221ff9c253..736b04658d 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 @@ -187,7 +187,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { @VisibleForTesting public ShardDataTree(final Shard shard, final SchemaContext schemaContext, final TreeType treeType) { - this(shard, schemaContext, treeType, YangInstanceIdentifier.EMPTY, + this(shard, schemaContext, treeType, YangInstanceIdentifier.empty(), new DefaultShardDataTreeChangeListenerPublisher(""), ""); } @@ -223,7 +223,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(); @@ -267,12 +267,12 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { final DataTreeModification mod = wrapper.apply(dataTree.takeSnapshot().newModification()); // delete everything first - mod.delete(YangInstanceIdentifier.EMPTY); + mod.delete(YangInstanceIdentifier.empty()); final Optional> maybeNode = snapshot.getRootNode(); if (maybeNode.isPresent()) { // Add everything from the remote node back - mod.write(YangInstanceIdentifier.EMPTY, maybeNode.get()); + mod.write(YangInstanceIdentifier.empty(), maybeNode.get()); } mod.ready(); @@ -645,8 +645,8 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { } Optional readCurrentData() { - return dataTree.takeSnapshot().readNode(YangInstanceIdentifier.EMPTY) - .map(state -> DataTreeCandidates.fromNormalizedNode(YangInstanceIdentifier.EMPTY, state)); + return dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()) + .map(state -> DataTreeCandidates.fromNormalizedNode(YangInstanceIdentifier.empty(), state)); } public void registerTreeChangeListener(final YangInstanceIdentifier path, final DOMDataTreeChangeListener listener, 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 e37519d846..019b0dbebe 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 @@ -117,7 +117,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction>>> futures = new ArrayList<>(allShardNames.size()); for (String shardName : allShardNames) { - futures.add(singleShardRead(shardName, YangInstanceIdentifier.EMPTY)); + futures.add(singleShardRead(shardName, YangInstanceIdentifier.empty())); } final ListenableFuture>>> listFuture = Futures.allAsList(futures); @@ -125,7 +125,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction { try { - return NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.EMPTY, input, + return NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.empty(), input, txContextFactory.getActorUtils().getSchemaContext(), txContextFactory.getActorUtils().getDatastoreContext().getLogicalStoreType()); } catch (DataValidationFailedException e) { 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 4da39ef154..fcfa615f7e 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 @@ -123,7 +123,7 @@ public class ConfigurationImpl implements Configuration { requireNonNull(prefix, "prefix should not be null"); Entry bestMatchEntry = new SimpleEntry<>( - new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null); + new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.empty()), null); for (Entry entry : prefixConfigMap.entrySet()) { if (entry.getKey().contains(prefix) && entry.getKey().getRootIdentifier().getPathArguments().size() @@ -272,7 +272,7 @@ public class ConfigurationImpl implements Configuration { requireNonNull(prefix, "Prefix cannot be null"); // FIXME using prefix tables like in mdsal will be better Entry bestMatchEntry = new SimpleEntry<>( - new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null); + new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.empty()), null); for (Entry entry : prefixConfigMap.entrySet()) { if (entry.getKey().contains(prefix) && entry.getKey().getRootIdentifier().getPathArguments().size() diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/DefaultShardStrategy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/DefaultShardStrategy.java index 8628b56461..7e37b10e77 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/DefaultShardStrategy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/DefaultShardStrategy.java @@ -34,6 +34,6 @@ public final class DefaultShardStrategy implements ShardStrategy { @Override public YangInstanceIdentifier getPrefixForPath(YangInstanceIdentifier path) { - return YangInstanceIdentifier.EMPTY; + return YangInstanceIdentifier.empty(); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java index 64e24a9cb9..772710bf2a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java @@ -31,7 +31,7 @@ public class ModuleShardStrategy implements ShardStrategy { @Override public YangInstanceIdentifier getPrefixForPath(YangInstanceIdentifier path) { - return YangInstanceIdentifier.EMPTY; + return YangInstanceIdentifier.empty(); } 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 5f6ef158c0..3c326dc2df 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 @@ -79,7 +79,7 @@ public class PruningDataTreeModification extends ForwardingObject implements Dat @Override public void merge(final YangInstanceIdentifier yangInstanceIdentifier, final NormalizedNode normalizedNode) { try { - if (YangInstanceIdentifier.EMPTY.equals(yangInstanceIdentifier)) { + if (YangInstanceIdentifier.empty().equals(yangInstanceIdentifier)) { pruneAndMergeNode(yangInstanceIdentifier, normalizedNode); } else { delegate.merge(yangInstanceIdentifier, normalizedNode); @@ -105,7 +105,7 @@ public class PruningDataTreeModification extends ForwardingObject implements Dat @Override public void write(final YangInstanceIdentifier yangInstanceIdentifier, final NormalizedNode normalizedNode) { try { - if (YangInstanceIdentifier.EMPTY.equals(yangInstanceIdentifier)) { + if (YangInstanceIdentifier.empty().equals(yangInstanceIdentifier)) { pruneAndWriteNode(yangInstanceIdentifier, normalizedNode); } else { delegate.write(yangInstanceIdentifier, normalizedNode); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java index 11db817522..e0d35580b8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java @@ -504,12 +504,13 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat ? distributedConfigDatastore.getActorUtils() : distributedOperDatastore.getActorUtils(); final Optional defaultLocalShardOptional = - actorUtils.findLocalShard(ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); + actorUtils.findLocalShard(ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty())); if (defaultLocalShardOptional.isPresent()) { LOG.debug("{}: Default shard for {} is already started, creating just frontend", memberName, logicalDatastoreType); - createShardFrontend(new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY)); + createShardFrontend(new DOMDataTreeIdentifier(logicalDatastoreType, + YangInstanceIdentifier.empty())); } // The local shard isn't present - we assume that means the local member isn't in the replica list @@ -521,7 +522,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat // final Collection names = distributedConfigDatastore.getActorUtils().getConfiguration() // .getUniqueMemberNamesForAllShards(); // Await.result(FutureConverters.toScala(createDistributedShard( -// new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), names)), +// new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.empty()), names)), // SHARD_FUTURE_TIMEOUT_DURATION); // } catch (DOMDataTreeShardingConflictException e) { // LOG.debug("{}: Default shard for {} already registered, possibly due to other node doing it faster", diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java index 90c6f3b6b6..dcb879bd0d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java @@ -108,7 +108,7 @@ class PrefixedShardConfigWriter { boolean checkDefaultIsPresent() { final NodeIdentifierWithPredicates pag = NodeIdentifierWithPredicates.of(ClusterUtils.SHARD_LIST_QNAME, ClusterUtils.SHARD_PREFIX_QNAME, - YangInstanceIdentifier.EMPTY); + YangInstanceIdentifier.empty()); final YangInstanceIdentifier defaultId = ClusterUtils.SHARD_LIST_PATH.node(pag); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java index 845104ea7b..c3e4369224 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java @@ -576,7 +576,7 @@ public class ShardedDataTreeActor extends AbstractUntypedPersistentActor { return false; } - if (YangInstanceIdentifier.EMPTY.equals(prefix.getRootIdentifier())) { + if (YangInstanceIdentifier.empty().equals(prefix.getRootIdentifier())) { return true; } 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 35d9d112a4..5bb61b0aef 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 @@ -46,15 +46,15 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest doReturn(CLIENT_ID).when(clientContext).getIdentifier(); doReturn(TRANSACTION_ID).when(delegate).getIdentifier(); - doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.EMPTY); - doReturn(immediateFluentFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.EMPTY); + doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.empty()); + doReturn(immediateFluentFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.empty()); object = new ClientBackedReadTransaction(delegate, null, null); } @Test public void testRead() throws Exception { - final ListenableFuture>> result = object().read(YangInstanceIdentifier.EMPTY); + final ListenableFuture>> result = object().read(YangInstanceIdentifier.empty()); final Optional> resultData = result.get(); assertTrue(resultData.isPresent()); assertEquals(data, resultData.get()); @@ -62,7 +62,7 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest @Test public void testExists() throws Exception { - final ListenableFuture result = object().exists(YangInstanceIdentifier.EMPTY); + final ListenableFuture result = object().exists(YangInstanceIdentifier.empty()); assertEquals(Boolean.TRUE, result.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 ad1fd1bf46..d651d089fb 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 @@ -47,15 +47,15 @@ public class ClientBackedReadWriteTransactionTest doReturn(TRANSACTION_ID).when(delegate).getIdentifier(); doReturn(readyCohort).when(delegate).ready(); - doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.EMPTY); - doReturn(immediateFluentFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.EMPTY); + doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.empty()); + doReturn(immediateFluentFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.empty()); object = new ClientBackedReadWriteTransaction(delegate, null); } @Test public void testRead() throws Exception { - final FluentFuture>> result = object().read(YangInstanceIdentifier.EMPTY); + final FluentFuture>> result = object().read(YangInstanceIdentifier.empty()); final Optional> resultData = result.get(); assertTrue(resultData.isPresent()); assertEquals(data, resultData.get()); @@ -63,6 +63,6 @@ public class ClientBackedReadWriteTransactionTest @Test public void testExists() throws Exception { - assertEquals(Boolean.TRUE, object().exists(YangInstanceIdentifier.EMPTY).get()); + assertEquals(Boolean.TRUE, object().exists(YangInstanceIdentifier.empty()).get()); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java index 7f0e0f5577..482045181a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java @@ -361,14 +361,14 @@ public class ConcurrentDOMDataBrokerTest { configDomStore), futureExecutor)) { DOMDataTreeReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction(); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); verify(configDomStore, never()).newReadWriteTransaction(); verify(operationalDomStore, times(1)).newReadWriteTransaction(); - dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); verify(configDomStore, times(1)).newReadWriteTransaction(); verify(operationalDomStore, times(1)).newReadWriteTransaction(); @@ -390,13 +390,13 @@ public class ConcurrentDOMDataBrokerTest { configDomStore), futureExecutor)) { DOMDataTreeWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction(); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); verify(configDomStore, never()).newWriteOnlyTransaction(); verify(operationalDomStore, times(1)).newWriteOnlyTransaction(); - dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); verify(configDomStore, times(1)).newWriteOnlyTransaction(); verify(operationalDomStore, times(1)).newWriteOnlyTransaction(); @@ -417,13 +417,13 @@ public class ConcurrentDOMDataBrokerTest { configDomStore), futureExecutor)) { DOMDataTreeReadTransaction dataTxn = dataBroker.newReadOnlyTransaction(); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); verify(configDomStore, never()).newReadOnlyTransaction(); verify(operationalDomStore, times(1)).newReadOnlyTransaction(); - dataTxn.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + dataTxn.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); verify(configDomStore, times(1)).newReadOnlyTransaction(); verify(operationalDomStore, times(1)).newReadOnlyTransaction(); @@ -458,7 +458,7 @@ public class ConcurrentDOMDataBrokerTest { }) { DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); domDataReadWriteTransaction.commit(); @@ -505,9 +505,9 @@ public class ConcurrentDOMDataBrokerTest { }) { DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, + domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); - domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, + domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); domDataReadWriteTransaction.commit(); @@ -552,7 +552,7 @@ public class ConcurrentDOMDataBrokerTest { verify(mockChain, never()).newWriteOnlyTransaction(); - domDataWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, + domDataWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); } } @@ -596,7 +596,7 @@ public class ConcurrentDOMDataBrokerTest { DOMDataTreeCommitCohort mockCohort = mock(DOMDataTreeCommitCohort.class); DOMDataTreeIdentifier path = new DOMDataTreeIdentifier( org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION, - YangInstanceIdentifier.EMPTY); + YangInstanceIdentifier.empty()); cohortRegistry.registerCommitCohort(path, mockCohort); verify(mockConfigStore).registerCommitCohort(path, mockCohort); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java index a9fa06d655..6ea02fe668 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java @@ -54,7 +54,7 @@ import scala.concurrent.Promise; public abstract class AbstractClientHandleTest> { private static final String PERSISTENCE_ID = "per-1"; - private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; + private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty(); @Mock private DataTree dataTree; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistoryTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistoryTest.java index 12f7478bd1..48ac3484f7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistoryTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistoryTest.java @@ -112,7 +112,7 @@ public abstract class AbstractClientHistoryTest @Test public void testResolveShardForPath() { - final Long shardForPath = object().resolveShardForPath(YangInstanceIdentifier.EMPTY); + final Long shardForPath = object().resolveShardForPath(YangInstanceIdentifier.empty()); Assert.assertEquals(0L, shardForPath.longValue()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java index bdba5d13e5..6528c6ba7c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java @@ -71,7 +71,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { @Test public void testResolveShardForPath() { - Assert.assertEquals(0L, behavior.resolveShardForPath(YangInstanceIdentifier.EMPTY).longValue()); + Assert.assertEquals(0L, behavior.resolveShardForPath(YangInstanceIdentifier.empty()).longValue()); } @Test @@ -136,7 +136,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { public void testGetConnection() { //set up data tree mock final CursorAwareDataTreeModification modification = mock(CursorAwareDataTreeModification.class); - when(modification.readNode(YangInstanceIdentifier.EMPTY)).thenReturn(Optional.empty()); + when(modification.readNode(YangInstanceIdentifier.empty())).thenReturn(Optional.empty()); final DataTreeSnapshot snapshot = mock(DataTreeSnapshot.class); when(snapshot.newModification()).thenReturn(modification); final DataTree dataTree = mock(DataTree.class); @@ -144,7 +144,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { final TestProbe backendProbe = new TestProbe(system, "backend"); final long shard = 0L; - behavior.createTransaction().read(YangInstanceIdentifier.EMPTY); + behavior.createTransaction().read(YangInstanceIdentifier.empty()); final AbstractClientConnection connection = behavior.getConnection(shard); //check cached connection for same shard Assert.assertSame(connection, behavior.getConnection(shard)); @@ -160,7 +160,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { final InternalCommand command = clientActorProbe.expectMsgClass(InternalCommand.class); command.execute(behavior); //check, whether command was reaplayed - verify(modification).readNode(YangInstanceIdentifier.EMPTY); + verify(modification).readNode(YangInstanceIdentifier.empty()); } private static ActorUtils createActorContextMock(final ActorSystem system, final ActorRef actor) { 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 8e5d5650f8..390dc7019d 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 @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class ClientSnapshotTest extends AbstractClientHandleTest { - private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; + private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty(); @Before @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolverTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolverTest.java index f44cdf327d..971330d0c5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolverTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolverTest.java @@ -84,7 +84,7 @@ public class ModuleShardBackendResolverTest { moduleShardBackendResolver = new ModuleShardBackendResolver(CLIENT_ID, actorUtils); when(actorUtils.getShardStrategyFactory()).thenReturn(shardStrategyFactory); - when(shardStrategyFactory.getStrategy(YangInstanceIdentifier.EMPTY)).thenReturn(shardStrategy); + when(shardStrategyFactory.getStrategy(YangInstanceIdentifier.empty())).thenReturn(shardStrategy); final PrimaryShardInfoFutureCache cache = new PrimaryShardInfoFutureCache(); when(actorUtils.getPrimaryShardInfoCache()).thenReturn(cache); } @@ -96,15 +96,15 @@ public class ModuleShardBackendResolverTest { @Test public void testResolveShardForPathNonNullCookie() { - when(shardStrategy.findShard(YangInstanceIdentifier.EMPTY)).thenReturn(DefaultShardStrategy.DEFAULT_SHARD); - final Long cookie = moduleShardBackendResolver.resolveShardForPath(YangInstanceIdentifier.EMPTY); + when(shardStrategy.findShard(YangInstanceIdentifier.empty())).thenReturn(DefaultShardStrategy.DEFAULT_SHARD); + final Long cookie = moduleShardBackendResolver.resolveShardForPath(YangInstanceIdentifier.empty()); Assert.assertEquals(0L, cookie.longValue()); } @Test public void testResolveShardForPathNullCookie() { - when(shardStrategy.findShard(YangInstanceIdentifier.EMPTY)).thenReturn("foo"); - final Long cookie = moduleShardBackendResolver.resolveShardForPath(YangInstanceIdentifier.EMPTY); + when(shardStrategy.findShard(YangInstanceIdentifier.empty())).thenReturn("foo"); + final Long cookie = moduleShardBackendResolver.resolveShardForPath(YangInstanceIdentifier.empty()); Assert.assertEquals(1L, cookie.longValue()); } 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 b7c863a104..c267a19e13 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 @@ -869,7 +869,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 { final NormalizedNode peopleNode = PeopleModel.create(); AbstractShardTest.writeToStore(dataTree, PeopleModel.BASE_PATH, peopleNode); - root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.EMPTY); + root = AbstractShardTest.readStore(dataTree, YangInstanceIdentifier.empty()); final Snapshot peopleSnapshot = Snapshot.create( new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)), 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 f425167f49..bf29c61409 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 @@ -347,7 +347,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)), @@ -417,7 +417,7 @@ public abstract class AbstractShardTest extends AbstractActorTest { final DataTreeCandidateTip mockCandidate = mock(DataTreeCandidateTip.class, name); final DataTreeCandidateNode mockCandidateNode = mock(DataTreeCandidateNode.class, name + "-node"); doReturn(ModificationType.UNMODIFIED).when(mockCandidateNode).getModificationType(); - doReturn(YangInstanceIdentifier.EMPTY).when(mockCandidate).getRootPath(); + doReturn(YangInstanceIdentifier.empty()).when(mockCandidate).getRootPath(); doReturn(mockCandidateNode).when(mockCandidate).getRootNode(); return mockCandidate; } 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 3e9208e384..a40739f114 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 @@ -108,7 +108,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { @Override public YangInstanceIdentifier getPrefixForPath(final YangInstanceIdentifier path) { - return YangInstanceIdentifier.EMPTY; + return YangInstanceIdentifier.empty(); } }).put( CarsModel.BASE_QNAME.getLocalName(), new ShardStrategy() { @@ -119,7 +119,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { @Override public YangInstanceIdentifier getPrefixForPath(final YangInstanceIdentifier path) { - return YangInstanceIdentifier.EMPTY; + return YangInstanceIdentifier.empty(); } }).build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java index 276d87f9af..5db3f39b6e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java @@ -138,7 +138,8 @@ public class DataTreeCohortActorTest extends AbstractActorTest { @SuppressWarnings("unchecked") @Test public void testFailureOnCanCommit() throws Exception { - DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock"); + DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.empty(), + "mock"); doReturn(FluentFutures.immediateFailedFluentFuture(failure)).when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), any(Collection.class)); @@ -195,7 +196,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { } private ActorRef newCohortActor(final String name) { - return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.EMPTY), name); + return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.empty()), name); } @SuppressWarnings("unchecked") 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 a35a901c6f..e9b4a75839 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 @@ -134,7 +134,7 @@ public class DatastoreSnapshotRestoreTest { 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/DistributedDataStoreRemotingIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java index 95149a1809..5abadccd50 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 @@ -1266,7 +1266,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { CarsModel.newCarsMapNode(CarsModel.newCarEntry("optima", BigInteger.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); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransactionTest.java index b34f80dd65..8a5705ded7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransactionTest.java @@ -133,7 +133,7 @@ public class FrontendReadWriteTransactionTest { assertNotNull(handleRequest(readyReq)); verify(mockParent).finishTransaction(same(shardTransaction), eq(Optional.empty())); - handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.EMPTY, true)); + handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.empty(), true)); } @Test(expected = IllegalStateException.class) @@ -160,6 +160,6 @@ public class FrontendReadWriteTransactionTest { assertNull(handleRequest(abortReq)); verify(mockParent).abortTransaction(same(shardTransaction), any(Runnable.class)); - handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.EMPTY, true)); + handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.empty(), true)); } } 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 9d920b5759..d319e0cae3 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 @@ -65,7 +65,7 @@ public class LocalTransactionContextTest { @Test public void testWrite() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); localTransactionContext.executeModification(new WriteModification(yangInstanceIdentifier, normalizedNode), null); @@ -74,7 +74,7 @@ public class LocalTransactionContextTest { @Test public void testMerge() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); localTransactionContext.executeModification(new MergeModification(yangInstanceIdentifier, normalizedNode), null); @@ -83,7 +83,7 @@ public class LocalTransactionContextTest { @Test public void testDelete() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier), null); verify(readWriteTransaction).delete(yangInstanceIdentifier); } @@ -91,7 +91,7 @@ public class LocalTransactionContextTest { @Test public void testRead() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); doReturn(FluentFutures.immediateFluentFuture(Optional.of(normalizedNode))).when(readWriteTransaction) .read(yangInstanceIdentifier); @@ -102,7 +102,7 @@ public class LocalTransactionContextTest { @Test public void testExists() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); doReturn(FluentFutures.immediateTrueFluentFuture()).when(readWriteTransaction).exists(yangInstanceIdentifier); localTransactionContext.executeRead(new DataExists(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION), SettableFuture.create(), null); @@ -123,7 +123,7 @@ public class LocalTransactionContextTest { @Test public void testReadyWithWriteError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); @@ -140,7 +140,7 @@ public class LocalTransactionContextTest { @Test public void testReadyWithMergeError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); @@ -157,7 +157,7 @@ public class LocalTransactionContextTest { @Test public void testReadyWithDeleteError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).delete(yangInstanceIdentifier); 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 142af6f5ed..0b78e3244d 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 @@ -129,6 +129,6 @@ public class ShardRecoveryCoordinatorTest extends AbstractTest { dataTree.commit(dataTree.prepare(modification)); return new ShardSnapshotState(new MetadataShardDataTreeSnapshot(dataTree.takeSnapshot().readNode( - YangInstanceIdentifier.EMPTY).get())); + YangInstanceIdentifier.empty()).get())); } } 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 46fdfacbe9..6e3782b0ae 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 YangInstanceIdentifier root = YangInstanceIdentifier.empty(); final NormalizedNode expected = readStore(store, root); final Snapshot snapshot = Snapshot.create(new ShardSnapshotState(new MetadataShardDataTreeSnapshot(expected)), @@ -1182,7 +1182,7 @@ public class ShardTest extends AbstractShardTest { final Duration duration = Duration.ofSeconds(5); final TransactionIdentifier transactionID1 = nextTransactionId(); - doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")) + doThrow(new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock canCommit failure")) .doNothing().when(dataTree).validate(any(DataTreeModification.class)); shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, @@ -1223,7 +1223,7 @@ public class ShardTest extends AbstractShardTest { ShardTestKit.waitUntilLeader(shard); - doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")) + doThrow(new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock canCommit failure")) .doNothing().when(dataTree).validate(any(DataTreeModification.class)); final Duration duration = Duration.ofSeconds(5); @@ -1737,7 +1737,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(); @@ -1780,16 +1780,16 @@ 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(); - writeTransaction.delete(YangInstanceIdentifier.EMPTY); - writeTransaction.write(YangInstanceIdentifier.EMPTY, expected); + writeTransaction.delete(YangInstanceIdentifier.empty()); + writeTransaction.write(YangInstanceIdentifier.empty(), expected); 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/ShardTransactionFailureTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java index 2eec393304..fa5e8f33b1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java @@ -75,12 +75,12 @@ public class ShardTransactionFailureTest extends AbstractActorTest { "testNegativeReadWithReadOnlyTransactionClosed"); Future future = akka.pattern.Patterns.ask(subject, - new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); + new ReadData(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), 3000); Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); subject.underlyingActor().getDOMStoreTransaction().abortFromTransactionActor(); - future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY, + future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), 3000); Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); } @@ -97,12 +97,12 @@ public class ShardTransactionFailureTest extends AbstractActorTest { "testNegativeReadWithReadWriteTransactionClosed"); Future future = akka.pattern.Patterns.ask(subject, - new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); + new ReadData(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), 3000); Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); subject.underlyingActor().getDOMStoreTransaction().abortFromTransactionActor(); - future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY, + future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), 3000); Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); } @@ -118,13 +118,13 @@ public class ShardTransactionFailureTest extends AbstractActorTest { "testNegativeExistsWithReadWriteTransactionClosed"); Future future = akka.pattern.Patterns.ask(subject, - new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); + new DataExists(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), 3000); Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); subject.underlyingActor().getDOMStoreTransaction().abortFromTransactionActor(); future = akka.pattern.Patterns.ask(subject, - new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); + new DataExists(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), 3000); Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); } } 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 d67d5b4763..cad66ac7f0 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 @@ -104,7 +104,7 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveReadData(final ActorRef transaction) { - transaction.tell(new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), + transaction.tell(new ReadData(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), testKit.getRef()); ReadDataReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), ReadDataReply.class); @@ -135,7 +135,7 @@ public class ShardTransactionTest extends AbstractActorTest { } private void testOnReceiveDataExistsPositive(final ActorRef transaction) { - transaction.tell(new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), + transaction.tell(new DataExists(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION), testKit.getRef()); DataExistsReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), DataExistsReply.class); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java index 7a4cb9b5ef..94617ed4c6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java @@ -98,12 +98,12 @@ public class SimpleShardDataTreeCohortTest extends AbstractTest { @Test public void testCanCommitWithConflictingModEx() { - testValidatationPropagates(new ConflictingModificationAppliedException(YangInstanceIdentifier.EMPTY, "mock")); + testValidatationPropagates(new ConflictingModificationAppliedException(YangInstanceIdentifier.empty(), "mock")); } @Test public void testCanCommitWithDataValidationEx() { - testValidatationPropagates(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock")); + testValidatationPropagates(new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock")); } @Test 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 5fa0dda7ae..ca72e6bbb8 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 @@ -1478,7 +1478,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { TransactionProxy transactionProxy = new TransactionProxy(mockComponentFactory, READ_ONLY); Optional> readOptional = transactionProxy.read( - YangInstanceIdentifier.EMPTY).get(5, TimeUnit.SECONDS); + YangInstanceIdentifier.empty()).get(5, TimeUnit.SECONDS); assertTrue("NormalizedNode isPresent", readOptional.isPresent()); @@ -1525,6 +1525,6 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { eqCreateTransaction(memberName, TransactionType.READ_ONLY), any(Timeout.class)); doReturn(readDataReply(expectedNode)).when(mockActorContext).executeOperationAsync( - eq(actorSelection(txActorRef)), eqReadData(YangInstanceIdentifier.EMPTY), any(Timeout.class)); + eq(actorSelection(txActorRef)), eqReadData(YangInstanceIdentifier.empty()), any(Timeout.class)); } } 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 fd2fa48f3c..fd94ef9a4c 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 @@ -43,7 +43,7 @@ public class NormalizedNodeAggregatorTest { 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))), @@ -90,7 +90,7 @@ public class NormalizedNodeAggregatorTest { DOMStoreReadTransaction readTransaction = store.newReadOnlyTransaction(); - FluentFuture>> read = readTransaction.read(YangInstanceIdentifier.EMPTY); + FluentFuture>> read = readTransaction.read(YangInstanceIdentifier.empty()); Optional> nodeOptional = read.get(); 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 18949ac21e..73db5465b5 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 @@ -190,11 +190,11 @@ public class PruningDataTreeModificationTest { localDataTree.validate(mod); localDataTree.commit(localDataTree.prepare(mod)); - NormalizedNode normalizedNode = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.EMPTY).get(); - pruningDataTreeModification.write(YangInstanceIdentifier.EMPTY, normalizedNode); + 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()); } @@ -204,15 +204,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( ImmutableNodes.containerNode(AUG_CONTAINER)).build(); - pruningDataTreeModification.write(YangInstanceIdentifier.EMPTY, normalizedNode); + 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()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontendTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontendTest.java index a567f0a13a..231b174ad6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontendTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardFrontendTest.java @@ -53,7 +53,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableCo public class DistributedShardFrontendTest { private static final DOMDataTreeIdentifier ROOT = - new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); private static final ListenableFuture SUCCESS_FUTURE = Futures.immediateFuture(null); private ShardedDOMDataTree shardedDOMDataTree; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java index a4bda16f20..a8249611bf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java @@ -171,10 +171,10 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest { leaderShardFactory.init(); leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(), - ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); + ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty())); leaderTestKit.waitUntilLeader(leaderOperDatastore.getActorUtils(), - ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); + ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty())); LOG.info("Initializing follower DistributedShardedDOMDataTree"); followerShardFactory.init(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java index 2432fd172e..68c16dc86d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeTest.java @@ -187,14 +187,14 @@ public class DistributedShardedDOMDataTreeTest extends AbstractTest { initEmptyDatastores(); final DOMDataTreeIdentifier configRoot = - new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); final DOMDataTreeProducer producer = leaderShardFactory.createProducer(Collections.singleton(configRoot)); final DOMDataTreeCursorAwareTransaction tx = producer.createTransaction(true); final DOMDataTreeWriteCursor cursor = tx.createCursor(new DOMDataTreeIdentifier( - LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY)); + LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty())); Assert.assertNotNull(cursor); final ContainerNode test = @@ -269,7 +269,7 @@ public class DistributedShardedDOMDataTreeTest extends AbstractTest { final ClientLocalHistory localHistory = distributedDataStoreClient.createLocalHistory(); final ClientTransaction tx2 = localHistory.createTransaction(); - final FluentFuture>> read = tx2.read(YangInstanceIdentifier.EMPTY); + final FluentFuture>> read = tx2.read(YangInstanceIdentifier.empty()); final Optional> optional = read.get(); tx2.abort(); @@ -384,7 +384,7 @@ public class DistributedShardedDOMDataTreeTest extends AbstractTest { } final DOMDataTreeIdentifier rootId = - new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); final DOMDataTreeProducer producer = leaderShardFactory.createProducer(Collections.singletonList( rootId)); @@ -492,7 +492,7 @@ public class DistributedShardedDOMDataTreeTest extends AbstractTest { final DOMDataTreeIdentifier configRoot = - new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); final DOMDataTreeProducer producer = leaderShardFactory.createProducer(Collections.singleton(configRoot)); assertTrue(producer instanceof CDSDataTreeProducer); diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java index 38c52d4508..8f52edd651 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java @@ -34,7 +34,7 @@ public abstract class DOMRpcIdentifier { @Override public YangInstanceIdentifier getContextReference() { - return YangInstanceIdentifier.EMPTY; + return YangInstanceIdentifier.empty(); } } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java index d616fb896b..c6602ba340 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java @@ -40,7 +40,7 @@ final class GlobalDOMRpcRoutingTableEntry extends AbstractDOMRpcRoutingTableEntr @Override protected CheckedFuture invokeRpc(final NormalizedNode input) { - return getImplementations(YangInstanceIdentifier.EMPTY).get(0).invokeRpc(rpcId, input); + return getImplementations(YangInstanceIdentifier.empty()).get(0).invokeRpc(rpcId, input); } @Override @@ -48,4 +48,4 @@ final class GlobalDOMRpcRoutingTableEntry extends AbstractDOMRpcRoutingTableEntr final Map> impls) { return new GlobalDOMRpcRoutingTableEntry(rpcId, impls); } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java index b4ae1cf559..1225aa1308 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java @@ -67,7 +67,7 @@ final class RoutedDOMRpcRoutingTableEntry extends AbstractDOMRpcRoutingTableEntr // Find a DOMRpcImplementation for a wild card. Usually remote-rpc-connector would register an // implementation this way - final List mayBeRemoteImpls = getImplementations(YangInstanceIdentifier.EMPTY); + final List mayBeRemoteImpls = getImplementations(YangInstanceIdentifier.empty()); if (mayBeRemoteImpls != null) { return mayBeRemoteImpls.get(0).invokeRpc(DOMRpcIdentifier.create(getSchemaPath(), iid), input); @@ -93,4 +93,4 @@ final class RoutedDOMRpcRoutingTableEntry extends AbstractDOMRpcRoutingTableEntr final Map> impls) { return new RoutedDOMRpcRoutingTableEntry(globalRpcId, keyId, impls); } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java index 3337d1ce9b..cac9b0a594 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java @@ -72,10 +72,10 @@ final class InMemoryDOMStoreTreeChangePublisher extends AbstractDOMStoreTreeChan final YangInstanceIdentifier treeId, final L listener, final DataTreeSnapshot snapshot) { final AbstractDOMDataTreeChangeListenerRegistration reg = registerTreeChangeListener(treeId, listener); - final Optional> node = snapshot.readNode(YangInstanceIdentifier.EMPTY); + final Optional> node = snapshot.readNode(YangInstanceIdentifier.empty()); if (node.isPresent()) { final DataTreeCandidate candidate = DataTreeCandidates.fromNormalizedNode( - YangInstanceIdentifier.EMPTY, node.get()); + YangInstanceIdentifier.empty(), node.get()); InMemoryDOMStoreTreeChangePublisher publisher = new InMemoryDOMStoreTreeChangePublisher(notificationManager); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteActionRegistryMXBeanImplTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteActionRegistryMXBeanImplTest.java index 67aba156ef..3d5655ded5 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteActionRegistryMXBeanImplTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteActionRegistryMXBeanImplTest.java @@ -49,7 +49,7 @@ public class RemoteActionRegistryMXBeanImplTest { system = ActorSystem.create("test"); final DOMActionInstance emptyActionIdentifier = DOMActionInstance.of( - EMPTY_SCHEMA_PATH, LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + EMPTY_SCHEMA_PATH, LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); final DOMActionInstance localActionIdentifier = DOMActionInstance.of( LOCAL_SCHEMA_PATH, LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(LOCAL_QNAME)); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java index 5ea18d2cb6..4d719a2a66 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java @@ -51,7 +51,7 @@ public class RemoteRpcRegistryMXBeanImplTest { system = ActorSystem.create("test"); final DOMRpcIdentifier emptyRpcIdentifier = DOMRpcIdentifier.create( - EMPTY_SCHEMA_PATH, YangInstanceIdentifier.EMPTY); + EMPTY_SCHEMA_PATH, YangInstanceIdentifier.empty()); final DOMRpcIdentifier localRpcIdentifier = DOMRpcIdentifier.create( LOCAL_SCHEMA_PATH, YangInstanceIdentifier.of(LOCAL_QNAME)); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java index be35234ce0..dcbedd6650 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java @@ -177,13 +177,13 @@ public class PrefixShardHandler { .build(); final DOMDataTreeProducer producer = domDataTreeService.createProducer(Collections.singleton( - new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY))); + new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()))); final DOMDataTreeCursorAwareTransaction tx = producer.createTransaction(false); final DOMDataTreeWriteCursor cursor = tx.createCursor(new DOMDataTreeIdentifier( - LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY)); + LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty())); cursor.merge(containerNode.getIdentifier(), containerNode); cursor.close(); -- 2.36.6