Reformatting

utPLSQL · pesse · Jun 26, 2019 · Jun 4, 2019 · Jun 7, 2019 · Jun 7, 2019
commit 81e0953149f01e557f790b48ace2d85188e1282e
diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
@@ -15,7 +15,7 @@ public static void main(String[] args) {
         System.exit(exitCode);
     }
 
-    static int runPicocliWithExitCode( String[] args ) {
+    static int runPicocliWithExitCode(String[] args) {
 
         LoggerConfiguration.configure(LoggerConfiguration.ConfigLevel.NONE);
         LocaleInitializer.initLocale();
@@ -30,25 +30,24 @@ static int runPicocliWithExitCode( String[] args ) {
             List<CommandLine> parsedLines = commandLine.parse(args);
 
             boolean commandWasRun = false;
-            for ( CommandLine parsedLine : parsedLines ) {
+            for (CommandLine parsedLine : parsedLines) {
                 if (parsedLine.isUsageHelpRequested()) {
                     parsedLine.usage(System.out);
                     return 0;
-                }
-                else if (parsedLine.isVersionHelpRequested()) {
+                } else if (parsedLine.isVersionHelpRequested()) {
                     parsedLine.printVersionHelp(System.out);
                     return 0;
                 }
 
                 Object command = parsedLine.getCommand();
-                if ( command instanceof ICommand ) {
-                    exitCode = ((ICommand)command).run();
+                if (command instanceof ICommand) {
+                    exitCode = ((ICommand) command).run();
                     commandWasRun = true;
                     break;
                 }
             }
 
-            if ( !commandWasRun ) {
+            if (!commandWasRun) {
                 commandLine.usage(System.out);
             }
         } catch (CommandLine.ParameterException e) {

diff --git a/src/main/java/org/utplsql/cli/CliVersionInfo.java b/src/main/java/org/utplsql/cli/CliVersionInfo.java
@@ -7,7 +7,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-/** This class is getting updated automatically by the build process.
+/**
+ * This class is getting updated automatically by the build process.
  * Please do not update its constants manually cause they will be overwritten.
  *
  * @author pesse
@@ -19,18 +20,22 @@ public class CliVersionInfo {
 
     static {
         try {
-            try ( InputStream in = JavaApiVersionInfo.class.getClassLoader().getResourceAsStream("utplsql-cli.version");
-                  BufferedReader reader = new BufferedReader(new InputStreamReader(in)) ) {
+            try (InputStream in = JavaApiVersionInfo.class.getClassLoader().getResourceAsStream("utplsql-cli.version");
+                 BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
                 MAVEN_PROJECT_VERSION = reader.readLine();
             }
-        }
-        catch ( IOException e ) {
+        } catch (IOException e) {
             System.out.println("WARNING: Could not get Version information!");
         }
     }
 
-    public static String getVersion() { return MAVEN_PROJECT_VERSION; }
-    public static String getInfo() { return MAVEN_PROJECT_NAME + " " + getVersion(); }
+    public static String getVersion() {
+        return MAVEN_PROJECT_VERSION;
+    }
+
+    public static String getInfo() {
+        return MAVEN_PROJECT_NAME + " " + getVersion();
+    }
 
 
 }
diff --git a/src/main/java/org/utplsql/cli/ConnectionConfig.java b/src/main/java/org/utplsql/cli/ConnectionConfig.java
@@ -9,22 +9,22 @@ public class ConnectionConfig {
     private final String password;
     private final String connect;
 
-    public ConnectionConfig( String connectString ) {
+    public ConnectionConfig(String connectString) {
         Matcher m = Pattern.compile("^(\".+\"|[^/]+)/(\".+\"|[^@]+)@(.*)$").matcher(connectString);
-        if ( m.find() ) {
+        if (m.find()) {
             user = stripEnclosingQuotes(m.group(1));
             password = stripEnclosingQuotes(m.group(2));
             connect = m.group(3);
-        }
-        else
+        } else {
             throw new IllegalArgumentException("Not a valid connectString: '" + connectString + "'");
+        }
     }
 
-    private String stripEnclosingQuotes( String value ) {
-        if ( value.length() > 1
+    private String stripEnclosingQuotes(String value) {
+        if (value.length() > 1
                 && value.startsWith("\"")
                 && value.endsWith("\"")) {
-            return value.substring(1, value.length()-1);
+            return value.substring(1, value.length() - 1);
         } else {
             return value;
         }
@@ -49,6 +49,6 @@ public String getConnectString() {
     public boolean isSysDba() {
         return user != null &&
                 (user.toLowerCase().endsWith(" as sysdba")
-                || user.toLowerCase().endsWith(" as sysoper"));
+                        || user.toLowerCase().endsWith(" as sysoper"));
     }
 }
diff --git a/src/main/java/org/utplsql/cli/DataSourceProvider.java b/src/main/java/org/utplsql/cli/DataSourceProvider.java
@@ -6,7 +6,8 @@
 import java.io.File;
 import java.sql.SQLException;
 
-/** Helper class to give you a ready-to-use datasource
+/**
+ * Helper class to give you a ready-to-use datasource
  *
  * @author pesse
  */
@@ -20,7 +21,7 @@ public class DataSourceProvider {
         }
     }
 
-    public static DataSource getDataSource(String connectString, int maxConnections ) throws SQLException {
+    public static DataSource getDataSource(String connectString, int maxConnections) throws SQLException {
 
         requireOjdbc();
 
@@ -31,8 +32,7 @@ public static DataSource getDataSource(String connectString, int maxConnections
     }
 
     private static void requireOjdbc() {
-        if ( !OracleLibraryChecker.checkOjdbcExists() )
-        {
+        if (!OracleLibraryChecker.checkOjdbcExists()) {
             System.out.println("Could not find Oracle JDBC driver in classpath. Please download the jar from Oracle website" +
                     " and copy it to the 'lib' folder of your utPLSQL-cli installation.");
             System.out.println("Download from http://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html");
@@ -42,7 +42,7 @@ private static void requireOjdbc() {
     }
 
     private static void warnIfSysDba(ConnectionConfig config) {
-        if ( config.isSysDba() ) {
+        if (config.isSysDba()) {
             System.out.println("WARNING: You are connecting to the database as SYSDBA or SYSOPER, which is NOT RECOMMENDED and can put your database at risk!");
         }
     }

diff --git a/src/main/java/org/utplsql/cli/FileWalker.java b/src/main/java/org/utplsql/cli/FileWalker.java
@@ -16,8 +16,9 @@ public List<String> getFileList(File baseDir, String inspectPath) {
     public List<String> getFileList(File baseDir, String inspectPath, boolean relative) {
         File inspectDir = new File(baseDir, inspectPath);
 
-        if (!inspectDir.isDirectory())
+        if (!inspectDir.isDirectory()) {
             throw new IllegalArgumentException(inspectPath + " is not a directory.");
+        }
 
         List<String> fileList = new ArrayList<>();
         listDirFiles(baseDir, inspectDir, fileList, relative);
@@ -28,15 +29,17 @@ public List<String> getFileList(File baseDir, String inspectPath, boolean relati
     private void listDirFiles(File baseDir, File directory, List<String> fileList, boolean relative) {
         File[] directoryFiles = directory.listFiles();
 
-        if (directoryFiles == null)
+        if (directoryFiles == null) {
             return;
+        }
 
         for (File file : directoryFiles) {
             if (file.isFile()) {
                 String absolutePath = file.getAbsolutePath();
 
-                if (relative)
+                if (relative) {
                     absolutePath = absolutePath.substring(baseDir.getAbsolutePath().length() + 1);
+                }
 
                 fileList.add(absolutePath);
             } else {

diff --git a/src/main/java/org/utplsql/cli/ICommand.java b/src/main/java/org/utplsql/cli/ICommand.java
@@ -1,12 +1,14 @@
 package org.utplsql.cli;
 
-/** This is the very basic interface that should be implemented by all utPLSQL cli commands
+/**
+ * This is the very basic interface that should be implemented by all utPLSQL cli commands
  *
  * @author pesse
  */
 public interface ICommand {
 
-    /** We expect the command to handle all eventually occurring exceptions
+    /**
+     * We expect the command to handle all eventually occurring exceptions
      * and return an exit code
      *
      * @return exit code integer

diff --git a/src/main/java/org/utplsql/cli/LocaleInitializer.java b/src/main/java/org/utplsql/cli/LocaleInitializer.java
@@ -6,54 +6,58 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/** This class makes sure the java locale is set according to the environment variables LC_ALL and LANG
+/**
+ * This class makes sure the java locale is set according to the environment variables LC_ALL and LANG
  * We experienced that, in some cases, the locale was not set as expected, therefore this class implements some clear
  * rules:
- *   1. If environment variable LC_ALL is set, we try to parse its content and set locale according to its value if valid
- *   2. If environment variable LANG is set, we try to parse its content and set locale according to its value if valid
- *   3. Otherwise we use default locale
+ * 1. If environment variable LC_ALL is set, we try to parse its content and set locale according to its value if valid
+ * 2. If environment variable LANG is set, we try to parse its content and set locale according to its value if valid
+ * 3. Otherwise we use default locale
  *
- *   @author pesse
+ * @author pesse
  */
 class LocaleInitializer {
 
     private static final Pattern REGEX_LOCALE = Pattern.compile("^([a-zA-Z]+)[_-]([a-zA-Z]+)"); // We only need the very first part and are pretty forgiving in parsing
 
-    /** Sets the default locale according to the rules described above
-     *
+    /**
+     * Sets the default locale according to the rules described above
      */
     static void initLocale() {
 
         boolean localeChanged = setDefaultLocale(EnvironmentVariableUtil.getEnvValue("LC_ALL"));
-        if ( !localeChanged )
+        if (!localeChanged) {
             setDefaultLocale(EnvironmentVariableUtil.getEnvValue("LANG"));
+        }
     }
 
-    /** Set the default locale from a given string like LC_ALL or LANG environment variable
+    /**
+     * Set the default locale from a given string like LC_ALL or LANG environment variable
      *
      * @param localeString Locale-string from LC_ALL or LANG, e.g "en_US.utf-8"
      * @return true if successful, false if not
      */
-    private static boolean setDefaultLocale( String localeString ) {
-        if ( localeString == null || localeString.isEmpty() )
+    private static boolean setDefaultLocale(String localeString) {
+        if (localeString == null || localeString.isEmpty()) {
             return false;
+        }
 
         try {
             Matcher m = REGEX_LOCALE.matcher(localeString);
             if (m.find()) {
                 StringBuilder sb = new StringBuilder();
                 sb.append(m.group(1));
-                if (m.group(2) != null)
+                if (m.group(2) != null) {
                     sb.append("-").append(m.group(2));
+                }
 
                 Locale l = new Locale.Builder().setLanguageTag(sb.toString()).build();
-                if ( l != null ) {
+                if (l != null) {
                     Locale.setDefault(l);
                     return true;
                 }
             }
-        }
-        catch ( Exception e ) {
+        } catch (Exception e) {
             System.out.println("Could not get locale from " + localeString);
         }
 

diff --git a/src/main/java/org/utplsql/cli/LoggerConfiguration.java b/src/main/java/org/utplsql/cli/LoggerConfiguration.java
@@ -16,11 +16,11 @@ public enum ConfigLevel {
     }
 
     private LoggerConfiguration() {
-       throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException();
     }
 
     static void configure(ConfigLevel level) {
-        switch ( level ) {
+        switch (level) {
             case BASIC:
                 configureInfo();
                 break;
@@ -48,17 +48,17 @@ private static void configureDebug() {
         setSingleConsoleAppenderWithLayout("%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n");
     }
 
-    private static void setRootLoggerLevel( Level level ) {
-        Logger root = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+    private static void setRootLoggerLevel(Level level) {
+        Logger root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
         root.setLevel(level);
     }
 
     private static void muteHikariLogger() {
         ((Logger) LoggerFactory.getLogger(HikariDataSource.class)).setLevel(Level.OFF);
     }
 
-    private static void setSingleConsoleAppenderWithLayout( String patternLayout ) {
-        Logger logger = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+    private static void setSingleConsoleAppenderWithLayout(String patternLayout) {
+        Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
         LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
 
         PatternLayoutEncoder ple = new PatternLayoutEncoder();

diff --git a/src/main/java/org/utplsql/cli/OracleLibraryChecker.java b/src/main/java/org/utplsql/cli/OracleLibraryChecker.java
@@ -1,33 +1,33 @@
 package org.utplsql.cli;
 
-/** Simple class to check whether needed Oracle libraries are on classpath or not
+/**
+ * Simple class to check whether needed Oracle libraries are on classpath or not
  *
  * @author pesse
  */
 class OracleLibraryChecker {
 
-    private static boolean classExists( String classFullName ){
-        try
-        {
+    private static boolean classExists(String classFullName) {
+        try {
             Class.forName(classFullName);
 
             return true;
-        }
-        catch ( ClassNotFoundException e )
-        {
+        } catch (ClassNotFoundException e) {
             return false;
         }
     }
 
-    /** Checks if OJDBC library is on the classpath by searching for oracle.jdbc.OracleDriver class
+    /**
+     * Checks if OJDBC library is on the classpath by searching for oracle.jdbc.OracleDriver class
      *
      * @return true or false
      */
     public static boolean checkOjdbcExists() {
         return classExists("oracle.jdbc.OracleDriver");
     }
 
-    /** Checks if Orai18n library is on the classpath by searching for oracle.i18n.text.OraCharset
+    /**
+     * Checks if Orai18n library is on the classpath by searching for oracle.i18n.text.OraCharset
      *
      * @return true or false
      */

diff --git a/src/main/java/org/utplsql/cli/ReporterFactoryProvider.java b/src/main/java/org/utplsql/cli/ReporterFactoryProvider.java
@@ -8,20 +8,21 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-/** A simple class to provide a ReporterFactory for the RunCommand
+/**
+ * A simple class to provide a ReporterFactory for the RunCommand
  *
  * @author pesse
  */
 class ReporterFactoryProvider {
 
-    public static ReporterFactory createReporterFactory(CompatibilityProxy proxy ) {
+    public static ReporterFactory createReporterFactory(CompatibilityProxy proxy) {
         ReporterFactory reporterFactory = ReporterFactory.createDefault(proxy);
         reporterFactory.registerReporterFactoryMethod(CoreReporters.UT_COVERAGE_HTML_REPORTER.name(), LocalAssetsCoverageHTMLReporter::new, "Will copy all necessary assets to a folder named after the Output-File");
 
         return reporterFactory;
     }
 
-    public static ReporterFactory createReporterFactory(Connection con ) throws SQLException {
+    public static ReporterFactory createReporterFactory(Connection con) throws SQLException {
         return createReporterFactory(new CompatibilityProxy(con));
     }
 }