X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTransactionActorFactory.java;h=881f3c39d0c701e4c93b391797b6694f01f3254a;hb=da174be7e22b16d4ac80cccefdc52b209b700745;hp=74c75dc2542b1e5b31370786874e74cfd1dc72bf;hpb=42b69ac5defea18d103ce2e1a3ee8156b83af8e8;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java
index 74c75dc254..881f3c39d0 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java
@@ -7,15 +7,15 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
+import static java.util.Objects.requireNonNull;
+
+import akka.actor.AbstractActor.ActorContext;
 import akka.actor.ActorRef;
-import akka.actor.UntypedActorContext;
-import com.google.common.base.Preconditions;
 import java.util.concurrent.atomic.AtomicLong;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
-import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
 
 /**
  * A factory for creating ShardTransaction actors.
@@ -29,20 +29,20 @@ class ShardTransactionActorFactory {
     private final DatastoreContext datastoreContext;
     private final String txnDispatcherPath;
     private final ShardStats shardMBean;
-    private final UntypedActorContext actorContext;
+    private final ActorContext actorContext;
     private final ActorRef shardActor;
     private final String shardName;
 
     ShardTransactionActorFactory(ShardDataTree dataTree, DatastoreContext datastoreContext,
-            String txnDispatcherPath, ActorRef shardActor, UntypedActorContext actorContext, ShardStats shardMBean,
+            String txnDispatcherPath, ActorRef shardActor, ActorContext actorContext, ShardStats shardMBean,
             String shardName) {
-        this.dataTree = Preconditions.checkNotNull(dataTree);
-        this.datastoreContext = Preconditions.checkNotNull(datastoreContext);
-        this.txnDispatcherPath = Preconditions.checkNotNull(txnDispatcherPath);
-        this.shardMBean = Preconditions.checkNotNull(shardMBean);
-        this.actorContext = Preconditions.checkNotNull(actorContext);
-        this.shardActor = Preconditions.checkNotNull(shardActor);
-        this.shardName = Preconditions.checkNotNull(shardName);
+        this.dataTree = requireNonNull(dataTree);
+        this.datastoreContext = requireNonNull(datastoreContext);
+        this.txnDispatcherPath = requireNonNull(txnDispatcherPath);
+        this.shardMBean = requireNonNull(shardMBean);
+        this.actorContext = requireNonNull(actorContext);
+        this.shardActor = requireNonNull(shardActor);
+        this.shardName = requireNonNull(shardName);
     }
 
     private String actorNameFor(final TransactionIdentifier txId) {
@@ -67,15 +67,10 @@ class ShardTransactionActorFactory {
         switch (type) {
             case READ_ONLY:
                 transaction = dataTree.newReadOnlyTransaction(transactionID);
-                shardMBean.incrementReadOnlyTransactionCount();
                 break;
             case READ_WRITE:
-                transaction = dataTree.newReadWriteTransaction(transactionID);
-                shardMBean.incrementReadWriteTransactionCount();
-                break;
             case WRITE_ONLY:
                 transaction = dataTree.newReadWriteTransaction(transactionID);
-                shardMBean.incrementWriteOnlyTransactionCount();
                 break;
             default:
                 throw new IllegalArgumentException("Unsupported transaction type " + type);