Removed Whitebox

Author: simasch

src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java

@@ -1,4 +1,4 @@
-package org.utplsql.maven.plugin.reporter;
+package org.utplsql.maven.plugin.io;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -7,7 +7,7 @@
 import org.utplsql.api.outputBuffer.OutputBuffer;
 import org.utplsql.api.outputBuffer.OutputBufferProvider;
 import org.utplsql.api.reporter.Reporter;
-import org.utplsql.maven.plugin.ReporterParameter;
+import org.utplsql.maven.plugin.model.ReporterParameter;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -29,7 +29,7 @@
  */
 public class ReportWriter {
 
-    private final List<Pair<Reporter, ReporterParameter>> listReporters;
+    private final List<Pair<Reporter, ReporterParameter>> reporters;
 
     private final String outputDirectory;
 
@@ -45,7 +45,7 @@ public class ReportWriter {
      * @param log             the Maven log
      */
     public ReportWriter(String outputDirectory, Version databaseVersion, Log log) {
-        this.listReporters = new ArrayList<>();
+        this.reporters = new ArrayList<>();
         this.outputDirectory = outputDirectory;
         this.databaseVersion = databaseVersion;
         this.log = log;
@@ -58,7 +58,7 @@ public ReportWriter(String outputDirectory, Version databaseVersion, Log log) {
      * @param reporter  the {@link Reporter}
      */
     public void addReporter(ReporterParameter parameter, Reporter reporter) {
-        listReporters.add(Pair.of(reporter, parameter));
+        reporters.add(Pair.of(reporter, parameter));
     }
 
     /**
@@ -68,11 +68,15 @@ public void addReporter(ReporterParameter parameter, Reporter reporter) {
      * @throws MojoExecutionException if any exception happens
      */
     public void writeReports(Connection connection) throws MojoExecutionException {
-        for (Pair<Reporter, ReporterParameter> pair : listReporters) {
+        for (Pair<Reporter, ReporterParameter> pair : reporters) {
             writeReports(connection, pair.getLeft(), pair.getRight());
         }
     }
 
+    public List<Pair<Reporter, ReporterParameter>> getReporters() {
+        return reporters;
+    }
+
     private void writeReports(Connection connection, Reporter reporter, ReporterParameter reporterParameter) throws MojoExecutionException {
         FileOutputStream fileOutputStream = null;
         try {

src/main/java/org/utplsql/maven/plugin/helper/PluginDefault.java

@@ -1,4 +1,4 @@
-package org.utplsql.maven.plugin.helper;
+package org.utplsql.maven.plugin.io;
 
 import org.apache.maven.model.Resource;
 import org.codehaus.plexus.util.DirectoryScanner;
@@ -14,11 +14,9 @@
  * Utility to scan all resources
  *
  * @author Alberto Hernández
+ * @author Simon Martinelli
  */
-public class SqlScannerHelper {
-
-    private SqlScannerHelper() {
-    }
+public class SqlFileScanner {
 
     /**
      * Scans a directory looking for the matching patterns.
@@ -29,11 +27,10 @@ private SqlScannerHelper() {
      * @param defaultFilePattern the default file pattern
      * @return a list of the files found
      */
-    public static List<String> findSqlScripts(File baseDir, List<Resource> resources, String defaultDirectory, String defaultFilePattern) {
+    public List<String> findSqlScripts(File baseDir, List<Resource> resources, String defaultDirectory, String defaultFilePattern) {
         List<String> founds = new ArrayList<>();
 
         for (Resource resource : resources) {
-
             if (resource.getDirectory() == null) {
                 resource.setDirectory(defaultDirectory);
             }
@@ -48,28 +45,22 @@ public static List<String> findSqlScripts(File baseDir, List<Resource> resources
             for (String basename : scanner.getIncludedFiles()) {
                 founds.add(baseDir.toURI().relativize(new File(scanner.getBasedir(), basename).toURI()).getPath());
             }
-
             founds.addAll(Collections.emptyList());
         }
 
         return founds;
     }
 
-    private static DirectoryScanner buildScanner(String baseDir, Resource resource) {
-
-        if (resource != null) {
-            File fileBaseDir = new File(baseDir, resource.getDirectory());
-            if (!fileBaseDir.exists() || !fileBaseDir.isDirectory() || !fileBaseDir.canRead()) {
-                throw new IllegalArgumentException(format("Invalid <directory> %s in resource. Check your pom.xml", resource.getDirectory()));
-            }
-
-            DirectoryScanner scanner = new DirectoryScanner();
-            scanner.setBasedir(fileBaseDir.getPath());
-            scanner.setIncludes(resource.getIncludes().toArray(new String[0]));
-            scanner.setExcludes(resource.getExcludes().toArray(new String[0]));
-            return scanner;
+    private DirectoryScanner buildScanner(String baseDir, Resource resource) {
+        File fileBaseDir = new File(baseDir, resource.getDirectory());
+        if (!fileBaseDir.exists() || !fileBaseDir.isDirectory() || !fileBaseDir.canRead()) {
+            throw new IllegalArgumentException(format("Invalid <directory> %s in resource. Check your pom.xml", resource.getDirectory()));
         }
 
-        throw new IllegalArgumentException();
+        DirectoryScanner scanner = new DirectoryScanner();
+        scanner.setBasedir(fileBaseDir.getPath());
+        scanner.setIncludes(resource.getIncludes().toArray(new String[0]));
+        scanner.setExcludes(resource.getExcludes().toArray(new String[0]));
+        return scanner;
     }
 }

…/maven/plugin/reporter/ReportWriter.java …tplsql/maven/plugin/io/ReportWriter.javasrc/main/java/org/utplsql/maven/plugin/reporter/ReportWriter.java renamed to src/main/java/org/utplsql/maven/plugin/io/ReportWriter.java src/main/java/org/utplsql/maven/plugin/reporter/ReportWriter.java renamed to src/main/java/org/utplsql/maven/plugin/io/ReportWriter.java

@@ -1,4 +1,4 @@
-package org.utplsql.maven.plugin;
+package org.utplsql.maven.plugin.model;
 
 /**
  * Bean used by Maven to populate its model.

…aven/plugin/helper/SqlScannerHelper.java …lsql/maven/plugin/io/SqlFileScanner.javasrc/main/java/org/utplsql/maven/plugin/helper/SqlScannerHelper.java renamed to src/main/java/org/utplsql/maven/plugin/io/SqlFileScanner.java src/main/java/org/utplsql/maven/plugin/helper/SqlScannerHelper.java renamed to src/main/java/org/utplsql/maven/plugin/io/SqlFileScanner.java

@@ -1,4 +1,4 @@
-package org.utplsql.maven.plugin;
+package org.utplsql.maven.plugin.model;
 
 import org.codehaus.plexus.util.StringUtils;