Merge "BUG-650: remove executor abstraction"

diff --combined opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
index 0caad94840d4224e17cc4d98777496130301229a,2d9d05ba15e0616da0023e5274d282d6707293ed..f5af93d584ce4ff62678f9f499cd629c96ccc80b
--- 1/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
--- 2/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
@@@ -9,7 -9,6 +9,6 @@@ import akka.actor.Props
  import akka.actor.Terminated;
  import akka.testkit.JavaTestKit;
  import akka.testkit.TestActorRef;
- import com.google.common.util.concurrent.ListeningExecutorService;
  import com.google.common.util.concurrent.MoreExecutors;
  import java.util.Collections;
  import java.util.concurrent.TimeUnit;
@@@ -48,11 -47,8 +47,8 @@@ import org.opendaylight.yangtools.yang.
  import scala.concurrent.duration.Duration;
  
  public class ShardTransactionTest extends AbstractActorTest {
-     private static ListeningExecutorService storeExecutor =
-         MoreExecutors.listeningDecorator(MoreExecutors.sameThreadExecutor());
- 
      private static final InMemoryDOMDataStore store =
-         new InMemoryDOMDataStore("OPER", storeExecutor, MoreExecutors.sameThreadExecutor());
+         new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor());
  
      private static final SchemaContext testSchemaContext = TestModel.createTestContext();
  
@@@ -347,6 -343,7 +343,6 @@@
  
      }
  
 -    @SuppressWarnings("unchecked")
      @Test
      public void testOnReceiveCloseTransaction() throws Exception {
          new JavaTestKit(getSystem()) {{