svn commit: r990038 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/ main/java/org/apache/shindig/gadgets/servlet/ test/java/org/apache/shindig/gadgets/servlet/

[li...@apache.org]

Author: lindner
Date: Fri Aug 27 06:29:27 2010
New Revision: 990038

URL: http://svn.apache.org/viewvc?rev=990038&view=rev
Log:
Executor -> ExecutorService, use Executors convenience routines

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=990038&r1=990037&r2=990038&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java Fri Aug 27 06:29:27 2010
@@ -68,9 +68,9 @@ public class DefaultGuiceModule extends 
   protected void configure() {
 
     final ExecutorService service = Executors.newCachedThreadPool(DAEMON_THREAD_FACTORY);
-    bind(Executor.class).toInstance(service);
-    bind(Executor.class).annotatedWith(Names.named("shindig.concat.executor")).toInstance(service);
     bind(ExecutorService.class).toInstance(service);
+    bind(ExecutorService.class).annotatedWith(Names.named("shindig.concat.executor")).toInstance(service);
+
     Runtime.getRuntime().addShutdownHook(new Thread() {
         public void run() {
             service.shutdownNow();

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=990038&r1=990037&r2=990038&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Fri Aug 27 06:29:27 2010
@@ -44,6 +44,8 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.FutureTask;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -76,12 +78,8 @@ public class ConcatProxyServlet extends 
   private transient ConcatUriManager concatUriManager;
   private transient ResponseRewriterRegistry contentRewriterRegistry;
 
-  private transient Executor executor = new Executor() {
-    public void execute(Runnable r) {
-      // Sequential version of 'execute' by default.
-      r.run();
-    }
-  };
+  // Sequential version of 'execute' by default.
+  private transient ExecutorService executor = Executors.newSingleThreadExecutor();
 
   @Inject
   public void setRequestPipeline(RequestPipeline requestPipeline) {
@@ -102,7 +100,7 @@ public class ConcatProxyServlet extends 
   }
   
   @Inject
-  public void setExecutor(@Named("shindig.concat.executor") Executor executor) {
+  public void setExecutor(@Named("shindig.concat.executor") ExecutorService executor) {
     checkInitialized();
     // Executor is independently named to allow separate configuration of
     // concat fetch parallelism and other Shindig job execution.

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java?rev=990038&r1=990037&r2=990038&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java Fri Aug 27 06:29:27 2010
@@ -37,7 +37,10 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import java.util.Map;
-import java.util.concurrent.Executor;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 public class ConcatProxyServletTest extends ServletTestFixture {
   private static final String REQUEST_DOMAIN = "example.org";
@@ -58,19 +61,8 @@ public class ConcatProxyServletTest exte
   private final ConcatProxyServlet servlet = new ConcatProxyServlet();
   private TestConcatUriManager uriManager;
   
-  private final Executor sequentialExecutor = new Executor() {
-    public void execute(Runnable r) {
-      // Sequential version of 'execute'.
-      r.run();
-    }
-  }; 
-
-  private final Executor threadedExecutor = new Executor() {
-    public void execute(Runnable r) {
-      // Threaded version of 'execute'.
-      new Thread(r).start();
-    }
-  }; 
+  private final ExecutorService sequentialExecutor = Executors.newSingleThreadExecutor();
+  private final ExecutorService threadedExecutor = Executors.newCachedThreadPool();
 
   @Before
   public void setUp() throws Exception {
@@ -126,7 +118,7 @@ public class ConcatProxyServletTest exte
    * @param uris - list of uris to concat
    * @throws Exception
    */
-  private void runConcat(Executor exec, String result, String tok, Uri... uris)
+  private void runConcat(ExecutorService exec, String result, String tok, Uri... uris)
       throws Exception {
     expectRequestWithUris(Lists.newArrayList(uris), tok);