Refactor: extract ReporterConfig -> ReporterOption conversion

pesse · pesse · commit 09bf357d76f6 · 2019-06-13T22:21:47.000+02:00
diff --git a/src/main/java/org/utplsql/cli/ReporterManager.java b/src/main/java/org/utplsql/cli/ReporterManager.java
@@ -4,6 +4,7 @@
 import org.utplsql.api.reporter.CoreReporters;
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;
+import org.utplsql.cli.config.ReporterConfig;
 import org.utplsql.cli.reporters.ReporterOptionsAware;
 
 import javax.sql.DataSource;
@@ -13,7 +14,6 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
@@ -23,17 +23,30 @@ class ReporterManager {
     private List<Throwable> reporterGatherErrors;
     private ExecutorService executorService;
 
-    ReporterManager( ReporterOptions[] reporterOptions ) {
-        this.reporterOptionsList = Arrays.asList(reporterOptions);
-        initReporterOptionsList();
+    ReporterManager(ReporterConfig[] reporterConfigs ) {
+        reporterOptionsList = new ArrayList<>();
+        if ( reporterConfigs != null && reporterConfigs.length > 0 ) {
+            loadOptionsFromConfigs( reporterConfigs );
+        }
+        else {
+            reporterOptionsList.add(getDefaultReporterOption());
+        }
     }
 
-    private void initReporterOptionsList( ) {
+    private void loadOptionsFromConfigs( ReporterConfig[] reporterConfigs ) {
+        boolean printToScreen = false;
+        for (ReporterConfig reporterConfig : reporterConfigs) {
+            ReporterOptions option = new ReporterOptions(
+                    reporterConfig.getName(),
+                    reporterConfig.getOutput());
 
-        // If no reporter parameters were passed, use default reporter.
-        if (reporterOptionsList.isEmpty()) {
-            reporterOptionsList = new ArrayList<>();
-            reporterOptionsList.add(getDefaultReporterOption());
+            option.forceOutputToScreen(reporterConfig.isForceToScreen());
+            reporterOptionsList.add(option);
+
+            // Check printToScreen validity
+            if (option.outputToScreen() && printToScreen)
+                throw new IllegalArgumentException("You cannot configure more than one reporter to output to screen");
+            printToScreen = option.outputToScreen();
         }
     }
 
diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java
@@ -14,7 +14,6 @@
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;
 import org.utplsql.cli.config.FileMapperConfig;
-import org.utplsql.cli.config.ReporterConfig;
 import org.utplsql.cli.config.RunCommandConfig;
 import org.utplsql.cli.exception.DatabaseConnectionFailed;
 import org.utplsql.cli.exception.ReporterTimeoutException;
@@ -273,25 +272,7 @@ private CompatibilityProxy checkFrameworkCompatibility(Connection conn) throws S
 
     private ReporterManager getReporterManager() {
         if ( reporterManager == null ) {
-
-            ReporterConfig[] reporterConfigs = config.getReporters();
-            if ( reporterConfigs != null ) {
-                ReporterOptions[] options = new ReporterOptions[reporterConfigs.length];
-                boolean printToScreen = false;
-                for (int i = 0; i<reporterConfigs.length; i++ ) {
-                    options[i] = new ReporterOptions(
-                            reporterConfigs[i].getName(),
-                            reporterConfigs[i].getOutput());
-
-                    options[i].forceOutputToScreen(reporterConfigs[i].isForceToScreen());
-
-                    // Check printToScreen validity
-                    if ( options[i].outputToScreen() && printToScreen )
-                        throw new IllegalArgumentException("You cannot configure more than one reporter to output to screen");
-                    printToScreen = options[i].outputToScreen();
-                }
-                reporterManager = new ReporterManager(options);
-            }
+            reporterManager = new ReporterManager(config.getReporters());
         }
 
         return reporterManager;
