From 0e1824a2f55e35c5b6cfd0407e27dbe1a7c54cf3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 1 Dec 2015 17:55:22 +0100 Subject: [PATCH] Remove DatastoreContext#getDataStoreType() This method should not be used anywhere, remove it. Also fix all callers to use getDataStoreName(). Change-Id: I3c9761951df335a1b3925f3756ff0fb90616a614 Signed-off-by: Robert Varga --- .../cluster/datastore/DatastoreContext.java | 8 -------- .../datastore/DatastoreContextIntrospector.java | 4 ++-- .../cluster/datastore/DistributedDataStore.java | 2 +- .../datastore/DistributedDataStoreFactory.java | 2 +- .../controller/cluster/datastore/ShardManager.java | 2 +- .../cluster/datastore/utils/ActorContext.java | 14 ++++++++++++-- .../DistributedConfigDataStoreProviderModule.java | 2 +- ...tributedOperationalDataStoreProviderModule.java | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) 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 cb65d5f7e1..8c01110f5c 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 @@ -184,14 +184,6 @@ public class DatastoreContext { return logicalStoreType; } - /** - * @deprecated Use {@link #getDataStoreName()} or {@link #getLogicalStoreType()} instead. - */ - @Deprecated - public String getDataStoreType(){ - return getDataStoreName(); - } - public long getTransactionCreationInitialRateLimit() { return transactionCreationInitialRateLimit; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java index 3cb4b3ccf1..0ef281319c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java @@ -203,7 +203,7 @@ public class DatastoreContextIntrospector { } Builder builder = DatastoreContext.newBuilderFrom(context); - String dataStoreTypePrefix = context.getDataStoreType() + '.'; + String dataStoreTypePrefix = context.getDataStoreName() + '.'; final String shardNamePrefix = forShardName + '.'; List keys = getSortedKeysByDatastoreType(currentProperties.keySet(), dataStoreTypePrefix); @@ -242,7 +242,7 @@ public class DatastoreContextIntrospector { Builder builder = DatastoreContext.newBuilderFrom(context); - final String dataStoreTypePrefix = context.getDataStoreType() + '.'; + final String dataStoreTypePrefix = context.getDataStoreName() + '.'; List keys = getSortedKeysByDatastoreType(Collections.list(properties.keys()), dataStoreTypePrefix); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java index 19c93b3dc4..4fd707e065 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java @@ -74,7 +74,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Preconditions.checkNotNull(configuration, "configuration should not be null"); Preconditions.checkNotNull(datastoreContextFactory, "datastoreContextFactory should not be null"); - this.type = datastoreContextFactory.getBaseDatastoreContext().getDataStoreType(); + this.type = datastoreContextFactory.getBaseDatastoreContext().getDataStoreName(); String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java index f55fa0731d..211465a35b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java @@ -23,7 +23,7 @@ public class DistributedDataStoreFactory { DatastoreContext datastoreContext, DatastoreSnapshot restoreFromSnapshot, ActorSystem actorSystem, BundleContext bundleContext) { - LOG.info("Create data store instance of type : {}", datastoreContext.getDataStoreType()); + LOG.info("Create data store instance of type : {}", datastoreContext.getDataStoreName()); DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext); DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay( diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java index c6d7d82c34..85f40e3a07 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java @@ -156,7 +156,7 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { this.cluster = builder.cluster; this.configuration = builder.configuration; this.datastoreContextFactory = builder.datastoreContextFactory; - this.type = builder.datastoreContextFactory.getBaseDatastoreContext().getDataStoreType(); + this.type = builder.datastoreContextFactory.getBaseDatastoreContext().getDataStoreName(); this.shardDispatcherPath = new Dispatchers(context().system().dispatchers()).getDispatcherPath(Dispatchers.DispatcherType.Shard); this.waitTillReadyCountdownLatch = builder.waitTillReadyCountdownLatch; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorContext.java index 792064cd67..42deda8227 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorContext.java @@ -478,7 +478,7 @@ public class ActorContext { * @return */ public Timer getOperationTimer(String operationName){ - return getOperationTimer(datastoreContext.getDataStoreType(), operationName); + return getOperationTimer(datastoreContext.getDataStoreName(), operationName); } public Timer getOperationTimer(String dataStoreType, String operationName){ @@ -487,13 +487,23 @@ public class ActorContext { return metricRegistry.timer(rate); } + /** + * Get the name of the data store to which this ActorContext belongs + * + * @return + */ + public String getDataStoreName() { + return datastoreContext.getDataStoreName(); + } + /** * Get the type of the data store to which this ActorContext belongs * * @return + * @deprecated Use {@link #getDataStoreName()} instead. */ public String getDataStoreType() { - return datastoreContext.getDataStoreType(); + return datastoreContext.getDataStoreName(); } /** diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java index 43e6723e8d..58be50f55a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java @@ -74,7 +74,7 @@ public class DistributedConfigDataStoreProviderModule extends .build(); return DistributedDataStoreFactory.createInstance(getConfigSchemaServiceDependency(), - datastoreContext, DatastoreSnapshotRestore.instance().getAndRemove(datastoreContext.getDataStoreType()), + datastoreContext, DatastoreSnapshotRestore.instance().getAndRemove(datastoreContext.getDataStoreName()), getConfigActorSystemProviderDependency().getActorSystem(), bundleContext); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java index d9225ab265..a5d22af954 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java @@ -75,7 +75,7 @@ public class DistributedOperationalDataStoreProviderModule extends .build(); return DistributedDataStoreFactory.createInstance(getOperationalSchemaServiceDependency(), - datastoreContext, DatastoreSnapshotRestore.instance().getAndRemove(datastoreContext.getDataStoreType()), + datastoreContext, DatastoreSnapshotRestore.instance().getAndRemove(datastoreContext.getDataStoreName()), getOperationalActorSystemProviderDependency().getActorSystem(), bundleContext); } -- 2.36.6