From: Tom Pantelis Date: Tue, 12 Jan 2016 07:27:11 +0000 (-0500) Subject: Remove deprecated getDataStoreType methods X-Git-Tag: release/beryllium~23 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=713762ab12bb2d37a44679c1d6a93b08750a50a6 Remove deprecated getDataStoreType methods getDataStoreName methods were recently added to DatastoreContext and ActorContext to replace the getDataStoreType methods. The latter were marked as deprecated but we can remove them since they aren't public APIs outside of the context of sal-distributed-datastore. The remaining callers were migrated to the getDataStoreName methods. Change-Id: I7dab731d96b3b8c249a59824de4d78ea72500e05 Signed-off-by: Tom Pantelis --- 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 8c01110f5c..9f2103f5e1 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 @@ -53,7 +53,7 @@ public class DatastoreContext { public static final long DEFAULT_SHARD_COMMIT_QUEUE_EXPIRY_TIMEOUT_IN_MS = TimeUnit.MILLISECONDS.convert(2, TimeUnit.MINUTES); public static final int DEFAULT_SHARD_SNAPSHOT_CHUNK_SIZE = 2048000; - private static final Set globalDatastoreTypes = Sets.newConcurrentHashSet(); + private static final Set globalDatastoreNames = Sets.newConcurrentHashSet(); private InMemoryDOMDataStoreConfigProperties dataStoreProperties; private Duration shardTransactionIdleTimeout = DatastoreContext.DEFAULT_SHARD_TRANSACTION_IDLE_TIMEOUT; @@ -75,8 +75,8 @@ public class DatastoreContext { private boolean transactionDebugContextEnabled = false; private String shardManagerPersistenceId; - public static Set getGlobalDatastoreTypes() { - return globalDatastoreTypes; + public static Set getGlobalDatastoreNames() { + return globalDatastoreNames; } private DatastoreContext() { @@ -385,14 +385,6 @@ public class DatastoreContext { return this; } - /** - * @deprecated Use {@link #logicalStoreType(LogicalDatastoreType)} or {@link #dataStoreName(String)}. - */ - @Deprecated - public Builder dataStoreType(String dataStoreType){ - return dataStoreName(dataStoreType); - } - public Builder logicalStoreType(LogicalDatastoreType logicalStoreType){ datastoreContext.logicalStoreType = Preconditions.checkNotNull(logicalStoreType); @@ -478,7 +470,7 @@ public class DatastoreContext { maxShardDataChangeListenerQueueSize, maxShardDataStoreExecutorQueueSize); if(datastoreContext.dataStoreName != null) { - globalDatastoreTypes.add(datastoreContext.dataStoreName); + globalDatastoreNames.add(datastoreContext.dataStoreName); } return datastoreContext; 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 5e8b1913c4..5252618fa1 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 @@ -185,7 +185,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, @Override public void onDatastoreContextUpdated(DatastoreContextFactory contextFactory) { - LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreType()); + LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreName()); actorContext.setDatastoreContext(contextFactory); datastoreConfigMXBean.setContext(contextFactory.getBaseDatastoreContext()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java index 068d326eff..a67d3de964 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java @@ -302,7 +302,7 @@ public class ClusterAdminRpcService implements ClusterAdminService, AutoCloseabl configDataStore.getActorContext() : operDataStore.getActorContext(); Set allShardNames = actorContext.getConfiguration().getAllShardNames(); - LOG.debug("Sending message to all shards {} for data store {}", allShardNames, actorContext.getDataStoreType()); + LOG.debug("Sending message to all shards {} for data store {}", allShardNames, actorContext.getDataStoreName()); for(String shardName: allShardNames) { ListenableFuture future = this.ask(actorContext.getShardManager(), messageSupplier.apply(shardName), 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 1dc49dc88a..7b541076de 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 @@ -502,17 +502,6 @@ public class ActorContext { return datastoreContext.getDataStoreName(); } - /** - * Get the type of the data store to which this ActorContext belongs - * - * @return - * @deprecated Use {@link #getDataStoreName()} instead. - */ - @Deprecated - public String getDataStoreType() { - return datastoreContext.getDataStoreName(); - } - /** * Get the current transaction creation rate limit * @return diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiter.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiter.java index b83b51c874..58c1bd6c25 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiter.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiter.java @@ -23,7 +23,7 @@ public class TransactionRateLimiter { private final ActorContext actorContext; private final long commitTimeoutInSeconds; - private final String dataStoreType; + private final String dataStoreName; private final RateLimiter txRateLimiter; private final AtomicLong acquireCount = new AtomicLong(); @@ -32,7 +32,7 @@ public class TransactionRateLimiter { public TransactionRateLimiter(ActorContext actorContext){ this.actorContext = actorContext; this.commitTimeoutInSeconds = actorContext.getDatastoreContext().getShardTransactionCommitTimeoutInSeconds(); - this.dataStoreType = actorContext.getDataStoreType(); + this.dataStoreName = actorContext.getDataStoreName(); this.txRateLimiter = RateLimiter.create(actorContext.getDatastoreContext().getTransactionCreationInitialRateLimit()); } @@ -65,16 +65,16 @@ public class TransactionRateLimiter { private double getRateLimitFromOtherDataStores(){ // Since we have no rate data for unused Tx's data store, adjust to the rate from another // data store that does have rate data. - for(String datastoreType: DatastoreContext.getGlobalDatastoreTypes()) { - if(datastoreType.equals(this.dataStoreType)) { + for(String name: DatastoreContext.getGlobalDatastoreNames()) { + if(name.equals(this.dataStoreName)) { continue; } - double newRateLimit = calculateNewRateLimit(actorContext.getOperationTimer(datastoreType, ActorContext.COMMIT), + double newRateLimit = calculateNewRateLimit(actorContext.getOperationTimer(name, ActorContext.COMMIT), this.commitTimeoutInSeconds); if(newRateLimit > 0.0) { LOG.debug("On unused Tx - data Store {} commit rateLimit adjusted to {}", - this.dataStoreType, newRateLimit); + this.dataStoreName, newRateLimit); return newRateLimit; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java index d5d4ad1afc..0c1a6a2760 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java @@ -139,7 +139,7 @@ public class MemberNode { final Set peerIds = Sets.newHashSet(); for(String p: peerMemberNames) { peerIds.add(ShardIdentifier.builder().memberName(p).shardName(shardName). - type(datastore.getActorContext().getDataStoreType()).build().toString()); + type(datastore.getActorContext().getDataStoreName()).build().toString()); } verifyRaftState(datastore, shardName, new RaftStateVerifier() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java index 4b7619d11a..9ac5c7af61 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java @@ -109,8 +109,8 @@ public class ClusterAdminRpcServiceTest { ImmutableMap map = ImmutableMap.of(snapshots.get(0).getType(), snapshots.get(0), snapshots.get(1).getType(), snapshots.get(1)); - verifyDatastoreSnapshot(node.configDataStore().getActorContext().getDataStoreType(), - map.get(node.configDataStore().getActorContext().getDataStoreType()), "cars", "people"); + verifyDatastoreSnapshot(node.configDataStore().getActorContext().getDataStoreName(), + map.get(node.configDataStore().getActorContext().getDataStoreName()), "cars", "people"); } finally { new File(fileName).delete(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiterTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiterTest.java index 2c89716487..e57036842d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiterTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/TransactionRateLimiterTest.java @@ -181,8 +181,8 @@ public class TransactionRateLimiterTest { } - DatastoreContext.getGlobalDatastoreTypes().add("config"); - DatastoreContext.getGlobalDatastoreTypes().add("operational"); + DatastoreContext.getGlobalDatastoreNames().add("config"); + DatastoreContext.getGlobalDatastoreNames().add("operational"); TransactionRateLimiter rateLimiter = new TransactionRateLimiter(actorContext);