sameThreadExecutor -> directExecutor

The former is deprecated and will be removed in "August 2016"

4 files changed, 4 insertions, 4 deletions

diff --git a/processing/src/main/java/com/yahoo/processing/Response.java b/processing/src/main/java/com/yahoo/processing/Response.java
index 3805311efba..44fbc7678fd 100644
--- a/processing/src/main/java/com/yahoo/processing/Response.java
+++ b/processing/src/main/java/com/yahoo/processing/Response.java
@@ -59,7 +59,7 @@ public class Response extends ListenableFreezableClass {
         if (freezeListener != null) {
             if (freezeListener instanceof ResponseReceiver)
                 ((ResponseReceiver)freezeListener).setResponse(this);
-            data.addFreezeListener(freezeListener, MoreExecutors.sameThreadExecutor());
+            data.addFreezeListener(freezeListener, MoreExecutors.directExecutor());
         }
     }
 
diff --git a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java b/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
index fe1e0d75ee3..ea6f451b41b 100644
--- a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
+++ b/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
@@ -383,7 +383,7 @@ public class ProcessorLibrary {
             // TODO: Consider for to best provide helpers for this
             response.data().complete().addListener(new RunnableExecution(request,
                     new ExecutionWithResponse(asyncChain, response, execution)),
-                    MoreExecutors.sameThreadExecutor());
+                    MoreExecutors.directExecutor());
             return response;
         }
 
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
index 6002c1993e2..8f0bc4a585d 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
@@ -55,7 +55,7 @@ public class StreamingTestCase {
         assertEquals("New data is not consumed", 1, response.data().asList().size());
 
         // start listening on incoming data - this is what a renderer will do
-        incomingData.addNewDataListener(new MockNewDataListener(incomingData), MoreExecutors.sameThreadExecutor());
+        incomingData.addNewDataListener(new MockNewDataListener(incomingData), MoreExecutors.directExecutor());
         assertEquals("We got a data add event for the data which was already added", 2, streamProcessor.invocationCount);
         assertEquals("New data is consumed", 2, response.data().asList().size());
 
diff --git a/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java b/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java
index afda8a7fe96..93b88bf4bb5 100644
--- a/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java
+++ b/processing/src/test/java/com/yahoo/processing/test/documentation/AsyncDataProcessingInitiator.java
@@ -23,7 +23,7 @@ public class AsyncDataProcessingInitiator extends Processor {
         Response response=execution.process(request);
         response.data().complete().addListener(new RunnableExecution(request,
                 new ExecutionWithResponse(asyncChain, response, execution)),
-                MoreExecutors.sameThreadExecutor());
+                MoreExecutors.directExecutor());
         return response;
     }