From 13ad69bc47bd5fa3f1df973861a5250ded0f59a7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 17 May 2016 15:49:11 +0200 Subject: [PATCH] BUG-5626: remove createTypedTransactionActor() This method has only a single internal caller, inline it for clarity. Change-Id: I136274b2375b4bb91f35d21dd5d8a206d1272867 Signed-off-by: Robert Varga --- .../controller/cluster/datastore/Shard.java | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 94753e553d..2251944660 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -587,13 +587,6 @@ public class Shard extends RaftActor { store.closeTransactionChain(closeTransactionChain.getTransactionChainId()); } - private ActorRef createTypedTransactionActor(int transactionType, - ShardTransactionIdentifier transactionId, String transactionChainId) { - - return transactionActorFactory.newShardTransaction(TransactionType.fromInt(transactionType), - transactionId, transactionChainId); - } - private void createTransaction(CreateTransaction createTransaction) { try { if(TransactionType.fromInt(createTransaction.getTransactionType()) != TransactionType.READ_ONLY && @@ -611,20 +604,11 @@ public class Shard extends RaftActor { } } - private ActorRef createTransaction(int transactionType, String remoteTransactionId, - String transactionChainId) { - - + private ActorRef createTransaction(int transactionType, String remoteTransactionId, String transactionChainId) { ShardTransactionIdentifier transactionId = new ShardTransactionIdentifier(remoteTransactionId); - - if(LOG.isDebugEnabled()) { - LOG.debug("{}: Creating transaction : {} ", persistenceId(), transactionId); - } - - ActorRef transactionActor = createTypedTransactionActor(transactionType, transactionId, - transactionChainId); - - return transactionActor; + LOG.debug("{}: Creating transaction : {} ", persistenceId(), transactionId); + return transactionActorFactory.newShardTransaction(TransactionType.fromInt(transactionType), + transactionId, transactionChainId); } private void commitWithNewTransaction(final Modification modification) { -- 2.36.6