From 380b9ee20a2032cd223e66dded8204519540803f Mon Sep 17 00:00:00 2001 From: Moiz Raja Date: Wed, 10 Jun 2015 11:33:00 -0700 Subject: [PATCH] Change variables, methods, field names from transactionContextAdapter to transactionContextWrapper Change-Id: I675df3d3c5ace1fcb4b82025e862eafa8cc37357 Signed-off-by: Moiz Raja (cherry picked from commit 080a1841e19ede9fd9c098d2e1350e0b618ac9f1) --- .../AbstractTransactionContextFactory.java | 24 ++++---- .../RemoteTransactionContextSupport.java | 20 +++---- .../cluster/datastore/TransactionProxy.java | 60 +++++++++---------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java index 19646f27fc..1e085523fd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java @@ -62,7 +62,7 @@ abstract class AbstractTransactionContextFactory findPrimaryFuture = findPrimaryShard(shardName); if(findPrimaryFuture.isCompleted()) { Try maybe = findPrimaryFuture.value().get(); if(maybe.isSuccess()) { - onFindPrimaryShardSuccess(maybe.get(), parent, shardName, transactionContextAdapter); + onFindPrimaryShardSuccess(maybe.get(), parent, shardName, transactionContextWrapper); } else { - onFindPrimaryShardFailure(maybe.failed().get(), parent, shardName, transactionContextAdapter); + onFindPrimaryShardFailure(maybe.failed().get(), parent, shardName, transactionContextWrapper); } } else { findPrimaryFuture.onComplete(new OnComplete() { @Override public void onComplete(final Throwable failure, final PrimaryShardInfo primaryShardInfo) { if (failure == null) { - onFindPrimaryShardSuccess(primaryShardInfo, parent, shardName, transactionContextAdapter); + onFindPrimaryShardSuccess(primaryShardInfo, parent, shardName, transactionContextWrapper); } else { - onFindPrimaryShardFailure(failure, parent, shardName, transactionContextAdapter); + onFindPrimaryShardFailure(failure, parent, shardName, transactionContextWrapper); } } }, actorContext.getClientDispatcher()); } - return transactionContextAdapter; + return transactionContextWrapper; } private void updateShardInfo(final String shardName, final PrimaryShardInfo primaryShardInfo) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java index 176073ef70..59205692d1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java @@ -50,13 +50,13 @@ final class RemoteTransactionContextSupport { private volatile ActorSelection primaryShard; private volatile int createTxTries; - private final TransactionContextWrapper transactionContextAdapter; + private final TransactionContextWrapper transactionContextWrapper; - RemoteTransactionContextSupport(final TransactionContextWrapper transactionContextAdapter, final TransactionProxy parent, + RemoteTransactionContextSupport(final TransactionContextWrapper transactionContextWrapper, final TransactionProxy parent, final String shardName) { this.parent = Preconditions.checkNotNull(parent); this.shardName = shardName; - this.transactionContextAdapter = transactionContextAdapter; + this.transactionContextWrapper = transactionContextWrapper; createTxTries = (int) (parent.getActorContext().getDatastoreContext(). getShardLeaderElectionTimeout().duration().toMillis() / CREATE_TX_TRY_INTERVAL.toMillis()); @@ -75,7 +75,7 @@ final class RemoteTransactionContextSupport { } private OperationLimiter getOperationLimiter() { - return transactionContextAdapter.getLimiter(); + return transactionContextWrapper.getLimiter(); } private TransactionIdentifier getIdentifier() { @@ -95,7 +95,7 @@ final class RemoteTransactionContextSupport { // For write-only Tx's we prepare the transaction modifications directly on the shard actor // to avoid the overhead of creating a separate transaction actor. - transactionContextAdapter.executePriorTransactionOperations(createValidTransactionContext(this.primaryShard, + transactionContextWrapper.executePriorTransactionOperations(createValidTransactionContext(this.primaryShard, this.primaryShard.path().toString(), primaryVersion)); } else { tryCreateTransaction(); @@ -171,7 +171,7 @@ final class RemoteTransactionContextSupport { localTransactionContext = new NoOpTransactionContext(exception, getIdentifier()); } - transactionContextAdapter.executePriorTransactionOperations(localTransactionContext); + transactionContextWrapper.executePriorTransactionOperations(localTransactionContext); } private TransactionContext createValidTransactionContext(CreateTransactionReply reply) { @@ -189,11 +189,11 @@ final class RemoteTransactionContextSupport { final TransactionContext ret; if (remoteTransactionVersion < DataStoreVersions.LITHIUM_VERSION) { - ret = new PreLithiumTransactionContextImpl(transactionContextAdapter.getIdentifier(), transactionPath, transactionActor, - getActorContext(), isTxActorLocal, remoteTransactionVersion, transactionContextAdapter.getLimiter()); + ret = new PreLithiumTransactionContextImpl(transactionContextWrapper.getIdentifier(), transactionPath, transactionActor, + getActorContext(), isTxActorLocal, remoteTransactionVersion, transactionContextWrapper.getLimiter()); } else { - ret = new RemoteTransactionContext(transactionContextAdapter.getIdentifier(), transactionActor, getActorContext(), - isTxActorLocal, remoteTransactionVersion, transactionContextAdapter.getLimiter()); + ret = new RemoteTransactionContext(transactionContextWrapper.getIdentifier(), transactionActor, getActorContext(), + isTxActorLocal, remoteTransactionVersion, transactionContextWrapper.getLimiter()); } if(parent.getType() == TransactionType.READ_ONLY) { 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 f7cb27b07f..c3a5d07414 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 @@ -51,7 +51,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction txContextAdapters = new HashMap<>(); + private final Map txContextWrappers = new HashMap<>(); private final AbstractTransactionContextFactory txContextFactory; private final TransactionType type; private TransactionState state = TransactionState.OPEN; @@ -73,8 +73,8 @@ public class TransactionProxy extends AbstractDOMStoreTransaction proxyFuture = SettableFuture.create(); - TransactionContextWrapper contextAdapter = getContextAdapter(path); - contextAdapter.maybeExecuteTransactionOperation(new TransactionOperation() { + TransactionContextWrapper contextWrapper = getContextWrapper(path); + contextWrapper.maybeExecuteTransactionOperation(new TransactionOperation() { @Override public void invoke(TransactionContext transactionContext) { transactionContext.dataExists(path, proxyFuture); @@ -100,8 +100,8 @@ public class TransactionProxy extends AbstractDOMStoreTransaction>, ReadFailedException> singleShardRead( final String shardName, final YangInstanceIdentifier path) { final SettableFuture>> proxyFuture = SettableFuture.create(); - TransactionContextWrapper contextAdapter = getContextAdapter(shardName); - contextAdapter.maybeExecuteTransactionOperation(new TransactionOperation() { + TransactionContextWrapper contextWrapper = getContextWrapper(shardName); + contextWrapper.maybeExecuteTransactionOperation(new TransactionOperation() { @Override public void invoke(TransactionContext transactionContext) { transactionContext.readData(path, proxyFuture); @@ -142,8 +142,8 @@ public class TransactionProxy extends AbstractDOMStoreTransaction ret; - switch (txContextAdapters.size()) { + switch (txContextWrappers.size()) { case 0: ret = NoOpDOMStoreThreePhaseCommitCohort.INSTANCE; break; case 1: - final Entry e = Iterables.getOnlyElement(txContextAdapters.entrySet()); + final Entry e = Iterables.getOnlyElement(txContextWrappers.entrySet()); ret = createSingleCommitCohort(e.getKey(), e.getValue()); break; default: - ret = createMultiCommitCohort(txContextAdapters.entrySet()); + ret = createMultiCommitCohort(txContextWrappers.entrySet()); } txContextFactory.onTransactionReady(getIdentifier(), ret.getCohortFutures()); @@ -248,18 +248,18 @@ public class TransactionProxy extends AbstractDOMStoreTransaction createSingleCommitCohort(final String shardName, - final TransactionContextWrapper contextAdapter) { + final TransactionContextWrapper contextWrapper) { LOG.debug("Tx {} Readying transaction for shard {}", getIdentifier(), shardName); final OperationCallback.Reference operationCallbackRef = new OperationCallback.Reference(OperationCallback.NO_OP_CALLBACK); - final TransactionContext transactionContext = contextAdapter.getTransactionContext(); + final TransactionContext transactionContext = contextWrapper.getTransactionContext(); final Future future; if (transactionContext == null) { final Promise promise = akka.dispatch.Futures.promise(); - contextAdapter.maybeExecuteTransactionOperation(new TransactionOperation() { + contextWrapper.maybeExecuteTransactionOperation(new TransactionOperation() { @Override public void invoke(TransactionContext transactionContext) { promise.completeWith(getReadyOrDirectCommitFuture(transactionContext, operationCallbackRef)); @@ -289,10 +289,10 @@ public class TransactionProxy extends AbstractDOMStoreTransaction createMultiCommitCohort( - final Set> txContextAdapterEntries) { + final Set> txContextWrapperEntries) { - final List> cohortFutures = new ArrayList<>(txContextAdapterEntries.size()); - for (Entry e : txContextAdapterEntries) { + final List> cohortFutures = new ArrayList<>(txContextWrapperEntries.size()); + for (Entry e : txContextWrapperEntries) { LOG.debug("Tx {} Readying transaction for shard {}", getIdentifier(), e.getKey()); cohortFutures.add(e.getValue().readyTransaction()); @@ -305,18 +305,18 @@ public class TransactionProxy extends AbstractDOMStoreTransaction