simplify buildShell

Author: frsyuki

src/main/java/org/embulk/output/CommandFileOutputPlugin.java

@@ -5,7 +5,6 @@
 import java.io.OutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
-
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import com.google.common.base.Throwables;
@@ -65,9 +64,8 @@ public TransactionalFileOutput open(TaskSource taskSource, final int taskIndex)
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
-        List<String> shell = new ShellFactory().build().get();
         List<String> cmdline = new ArrayList<String>();
-        cmdline.addAll(shell);
+        cmdline.addAll(buildShell());
         cmdline.add(task.getCommand());
 
         logger.info("Using command {}", cmdline);
@@ -76,22 +74,13 @@ public TransactionalFileOutput open(TaskSource taskSource, final int taskIndex)
     }
 
     @VisibleForTesting
-    static class ShellFactory
+    static List<String> buildShell()
     {
-        private List<String> shell;
-
-        public List<String> get() {
-            return this.shell;
-        }
-
-        public ShellFactory build() {
-            String osName = System.getProperty("os.name");
-            if(osName.indexOf("Windows") >= 0) {
-                this.shell = ImmutableList.of("PowerShell.exe", "-Command");
-            } else {
-                this.shell = ImmutableList.of("sh", "-c");
-            }
-            return this;
+        String osName = System.getProperty("os.name");
+        if(osName.indexOf("Windows") >= 0) {
+            return ImmutableList.of("PowerShell.exe", "-Command");
+        } else {
+            return ImmutableList.of("sh", "-c");
         }
     }
 

src/test/java/org/embulk/output/TestCommandFileOutputPlugin.java

@@ -5,7 +5,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.embulk.EmbulkTestRuntime;
-import org.embulk.output.CommandFileOutputPlugin.ShellFactory;
+import static org.embulk.output.CommandFileOutputPlugin.buildShell;
 
 import java.util.List;
 
@@ -16,24 +16,13 @@ public class TestCommandFileOutputPlugin
     @Rule
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
 
-    private ShellFactory shellFactory;
-
-    @Before
-    public void createResources()
-    {
-        shellFactory = new ShellFactory().build();
-    }
-
     @Test
     public void testShell() {
-        List<String> shell = shellFactory.get();
-        String osName = System.getProperty("os.name");
-        List<String> actualShellCmd;
-        if (osName.indexOf("Windows") >= 0) {
-            actualShellCmd = ImmutableList.of("PowerShell.exe", "-Command");
-        } else {
-            actualShellCmd = ImmutableList.of("sh", "-c");
+        if (System.getProperty("os.name").indexOf("Windows") >= 0) {
+            assertEquals(ImmutableList.of("PowerShell.exe", "-Command"), buildShell());
+        }
+        else {
+            assertEquals(ImmutableList.of("sh", "-c"), buildShell());
         }
-        assertEquals(actualShellCmd, shell);
     }
 }