Refactor again

Author: Benoit Guerin

.settings/CasperJS_format_profile.xml

@@ -16,7 +16,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>

.settings/org.eclipse.jdt.core.prefs

@@ -282,7 +282,7 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

src/main/java/com/github/casperjs/casperjsrunner/AbstractCasperJSRunnerMojo.java

@@ -19,6 +19,12 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.toolchain.ToolchainManager;
 
+import com.github.casperjs.casperjsrunner.cmd.CasperJsRuntime;
+import com.github.casperjs.casperjsrunner.cmd.NativeOptions;
+import com.github.casperjs.casperjsrunner.cmd.Reports;
+import com.github.casperjs.casperjsrunner.cmd.ScriptOptions;
+import com.github.casperjs.casperjsrunner.cmd.TestOptions;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -398,10 +404,18 @@ private Result executeScripts(final Collection<String> files) {
 
     private int executeScript(final File f) {
         final String scriptName = buildName(scriptsDir, f);
+
+        //@formatter:off
         return executeCommand(
-                computeCmdLine(buildParameters(casperRuntime, casperJsVersion, failFast, casperjsVerbose, logLevel, engine, includes,
-                        includesPatterns, includesDir, pre, post, testsDir, enableXmlReports, reportsDir, scriptName, f, arguments)),
+                computeCmdLine(
+                        buildParameters(
+                                new CasperJsRuntime(casperRuntime, casperJsVersion),
+                                new NativeOptions(failFast, casperjsVerbose, logLevel),
+                                new TestOptions(engine, includes, includesPatterns, includesDir, pre, post, testsDir),
+                                new Reports(enableXmlReports, reportsDir),
+                                new ScriptOptions(scriptName, f, arguments))),
                 environmentVariables, verbose, computeLogFile(scriptName));
+        //@formatter:on
     }
 
     private File computeLogFile(final String scriptName) {

src/main/java/com/github/casperjs/casperjsrunner/cmd/CasperJsRuntime.java

@@ -0,0 +1,22 @@
+package com.github.casperjs.casperjsrunner.cmd;
+
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+
+public class CasperJsRuntime {
+
+    private String exe;
+    private ArtifactVersion version;
+
+    public CasperJsRuntime(final String exe, final ArtifactVersion version) {
+        this.exe = exe;
+        this.version = version;
+    }
+
+    public String getExe() {
+        return exe;
+    }
+
+    public ArtifactVersion getVersion() {
+        return version;
+    }
+}

src/main/java/com/github/casperjs/casperjsrunner/cmd/NativeOptions.java

@@ -0,0 +1,26 @@
+package com.github.casperjs.casperjsrunner.cmd;
+
+public class NativeOptions {
+
+    private boolean failFast;
+    private boolean verbose;
+    private String level;
+
+    public NativeOptions(final boolean failFast, final boolean verbose, final String level) {
+        this.failFast = failFast;
+        this.verbose = verbose;
+        this.level = level;
+    }
+
+    public boolean isFailFast() {
+        return failFast;
+    }
+
+    public boolean isVerbose() {
+        return verbose;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+}

src/main/java/com/github/casperjs/casperjsrunner/cmd/Parameters.java

@@ -5,40 +5,89 @@
 import java.io.File;
 import java.util.List;
 
-public interface Parameters {
-
-    String getCasperRuntime();
-
-    ArtifactVersion getCasperJsVersion();
-
-    boolean isFailFast();
-
-    boolean isCasperjsVerbose();
-
-    String getLogLevel();
-
-    String getEngine();
-
-    String getIncludes();
-
-    List<String> getIncludesPatterns();
-
-    File getIncludesDir();
-
-    String getPre();
-
-    String getPost();
-
-    File getTestsDir();
-
-    boolean isEnableXmlReports();
-
-    File getReportsDir();
-
-    String getScriptName();
-
-    File getScriptFile();
-
-    List<String> getArguments();
+public class Parameters {
+
+    private CasperJsRuntime runtime;
+    private NativeOptions nativeOptions;
+    private TestOptions testOptions;
+    private Reports reports;
+    private ScriptOptions scriptOptions;
+
+    public Parameters(final CasperJsRuntime runtime, final NativeOptions nativeOptions, final TestOptions testOptions, final Reports reports,
+            final ScriptOptions scriptOptions) {
+        this.runtime = runtime;
+        this.nativeOptions = nativeOptions;
+        this.testOptions = testOptions;
+        this.reports = reports;
+        this.scriptOptions = scriptOptions;
+    }
+
+    public String getCasperRuntime() {
+        return runtime.getExe();
+    }
+
+    public ArtifactVersion getCasperJsVersion() {
+        return runtime.getVersion();
+    }
+
+    public boolean isFailFast() {
+        return nativeOptions.isFailFast();
+    }
+
+    public boolean isCasperjsVerbose() {
+        return nativeOptions.isVerbose();
+    }
+
+    public String getLogLevel() {
+        return nativeOptions.getLevel();
+    }
+
+    public String getEngine() {
+        return testOptions.getEngine();
+    }
+
+    public String getIncludes() {
+        return testOptions.getIncludes();
+    }
+
+    public List<String> getIncludesPatterns() {
+        return testOptions.getIncludesPatterns();
+    }
+
+    public File getIncludesDir() {
+        return testOptions.getIncludesDir();
+    }
+
+    public String getPre() {
+        return testOptions.getPre();
+    }
+
+    public String getPost() {
+        return testOptions.getPost();
+    }
+
+    public File getTestsDir() {
+        return testOptions.getTestsDir();
+    }
+
+    public boolean isEnableXmlReports() {
+        return reports.isEnable();
+    }
+
+    public File getReportsDir() {
+        return reports.getDirectory();
+    }
+
+    public String getScriptName() {
+        return scriptOptions.getScriptName();
+    }
+
+    public File getScriptFile() {
+        return scriptOptions.getFile();
+    }
+
+    public List<String> getArguments() {
+        return scriptOptions.getArguments();
+    }
 
 }

src/main/java/com/github/casperjs/casperjsrunner/cmd/ParametersFactory.java

@@ -1,105 +1,13 @@
 package com.github.casperjs.casperjsrunner.cmd;
 
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-
-import java.io.File;
-import java.util.List;
-
 public class ParametersFactory {
 
     private ParametersFactory() {
         // only used as static
     }
 
-    public static Parameters buildParameters(final String casperRuntime, final ArtifactVersion casperJsVersion, final boolean failFast,
-            final boolean casperjsVerbose, final String logLevel, final String engine, final String includes, final List<String> includesPatterns,
-            final File includesDir, final String pre, final String post, final File testsDir, final boolean enableXmlReports, final File reportsDir,
-            final String scriptName, final File f, final List<String> arguments) {
-        return new Parameters() {
-            @Override
-            public String getCasperRuntime() {
-                return casperRuntime;
-            }
-
-            @Override
-            public ArtifactVersion getCasperJsVersion() {
-                return casperJsVersion;
-            }
-
-            @Override
-            public boolean isFailFast() {
-                return failFast;
-            }
-
-            @Override
-            public boolean isCasperjsVerbose() {
-                return casperjsVerbose;
-            }
-
-            @Override
-            public String getLogLevel() {
-                return logLevel;
-            }
-
-            @Override
-            public String getEngine() {
-                return engine;
-            }
-
-            @Override
-            public String getIncludes() {
-                return includes;
-            }
-
-            @Override
-            public List<String> getIncludesPatterns() {
-                return includesPatterns;
-            }
-
-            @Override
-            public File getIncludesDir() {
-                return includesDir;
-            }
-
-            @Override
-            public String getPre() {
-                return pre;
-            }
-
-            @Override
-            public String getPost() {
-                return post;
-            }
-
-            @Override
-            public File getTestsDir() {
-                return testsDir;
-            }
-
-            @Override
-            public boolean isEnableXmlReports() {
-                return enableXmlReports;
-            }
-
-            @Override
-            public File getReportsDir() {
-                return reportsDir;
-            }
-
-            @Override
-            public String getScriptName() {
-                return scriptName;
-            }
-
-            @Override
-            public File getScriptFile() {
-                return f;
-            }
-
-            @Override
-            public List<String> getArguments() {
-                return arguments;
-            }
-        };
+    public static Parameters buildParameters(final CasperJsRuntime runtime, final NativeOptions nativeOptions, final TestOptions testOptions,
+            final Reports reports, final ScriptOptions scriptOptions) {
+        return new Parameters(runtime, nativeOptions, testOptions, reports, scriptOptions);
     }
 }

src/main/java/com/github/casperjs/casperjsrunner/cmd/Reports.java

@@ -0,0 +1,22 @@
+package com.github.casperjs.casperjsrunner.cmd;
+
+import java.io.File;
+
+public class Reports {
+
+    private boolean enable;
+    private File directory;
+
+    public Reports(final boolean enable, final File directory) {
+        this.enable = enable;
+        this.directory = directory;
+    }
+
+    public boolean isEnable() {
+        return enable;
+    }
+
+    public File getDirectory() {
+        return directory;
+    }
+}

src/main/java/com/github/casperjs/casperjsrunner/cmd/ScriptOptions.java

@@ -0,0 +1,29 @@
+package com.github.casperjs.casperjsrunner.cmd;
+
+import java.io.File;
+import java.util.List;
+
+public class ScriptOptions {
+
+    private String scriptName;
+    private File file;
+    private List<String> arguments;
+
+    public ScriptOptions(final String scriptName, final File file, final List<String> arguments) {
+        this.scriptName = scriptName;
+        this.file = file;
+        this.arguments = arguments;
+    }
+
+    public String getScriptName() {
+        return scriptName;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public List<String> getArguments() {
+        return arguments;
+    }
+}