Merge pull request #3 from pandening/develop

fix executorService

Author: pandening

Diff for: core/src/main/java/com/google/googlejavaformat/java/Formatter.java

@@ -236,8 +236,8 @@ public void formatSource(CharSource input, CharSink output)
    * @param timeoutForAll if true, total timeout is {@code timeout}, else timeout is {@code timeout * fileCount}
    * @return the formatted java source
    */
-  public List<String> formatSourceFile(String file, boolean useExecutor, boolean reWrite,
-                                       long timeout, TimeUnit unit, boolean timeoutForAll)
+  public List<String> formatSourceFile(String file, boolean useExecutor, ExecutorService executorService,
+                                       boolean reWrite, long timeout, TimeUnit unit, boolean timeoutForAll)
           throws IOException, FormatterException {
     if (Strings.isNullOrEmpty(file)) {
       return Collections.emptyList();
@@ -248,6 +248,9 @@ public List<String> formatSourceFile(String file, boolean useExecutor, boolean r
       unit = TimeUnit.SECONDS;
       timeoutForAll = false;
     }
+    if (executorService == null) {
+      executorService = EXECUTOR_SERVICE;
+    }
     File sourceFile = new File(file);
     if (sourceFile.isFile()) {
       // this is a file
@@ -262,7 +265,7 @@ public List<String> formatSourceFile(String file, boolean useExecutor, boolean r
             formatted = "";
           }
           return ImmutableList.of(formatted); // do not update the file source.
-        }, EXECUTOR_SERVICE);
+        }, executorService);
         try {
           if (formattedFuture.get(timeout, unit) == null) {
             return Collections.emptyList();
@@ -298,7 +301,7 @@ public List<String> formatSourceFile(String file, boolean useExecutor, boolean r
               formatted = "";
             }
             return formatted;
-          }, EXECUTOR_SERVICE));
+          }, executorService));
         }
         // check the status.
         CompletableFuture<List<String>> formattedResultFuture =