Refactoring according to Pazus suggestions

utPLSQL · Pazus · Feb 14, 2019 · Feb 5, 2019 · Feb 6, 2019 · Feb 7, 2019
commit 053dfc9df81f18acd3826d2d3577919c617bf99e
diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
@@ -18,6 +18,8 @@ public static void main(String[] args) {
     }
 
     static int runWithExitCode( String[] args ) {
+
+        LoggerConfiguration.configure(LoggerConfiguration.ConfigLevel.NONE);
         LocaleInitializer.initLocale();
 
         JCommander jc = new JCommander();

diff --git a/src/main/java/org/utplsql/cli/LoggerConfiguration.java b/src/main/java/org/utplsql/cli/LoggerConfiguration.java
@@ -8,44 +8,57 @@
 import ch.qos.logback.core.ConsoleAppender;
 import com.zaxxer.hikari.HikariDataSource;
 import org.slf4j.LoggerFactory;
-import org.utplsql.api.TestRunner;
 
 class LoggerConfiguration {
+
+    public enum ConfigLevel {
+        BASIC, NONE, DEBUG
+    }
+
     private LoggerConfiguration() {
        throw new UnsupportedOperationException();
     }
-    static void configure(boolean silent, boolean debug) {
-        if ( silent )
-            configureSilent();
-        else if ( debug )
-            configureDebug();
-        else
-            configureDefault();
+
+    static void configure(ConfigLevel level) {
+        switch ( level ) {
+            case BASIC:
+                configureInfo();
+                break;
+            case NONE:
+                configureSilent();
+                break;
+            case DEBUG:
+                configureDebug();
+                break;
+        }
     }
 
     private static void configureSilent() {
-        Logger root = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-        root.setLevel(Level.OFF);
+        setRootLoggerLevel(Level.OFF);
     }
 
-    private static void configureDefault() {
-        Logger root = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-        root.setLevel(Level.INFO);
-
-        ((Logger) LoggerFactory.getLogger(HikariDataSource.class)).setLevel(Level.OFF);
-        ((Logger) LoggerFactory.getLogger(TestRunner.class)).setLevel(Level.ERROR);
-
-        setSingleConsoleAppenderWithLayout(root, "%msg%n");
+    private static void configureInfo() {
+        setRootLoggerLevel(Level.INFO);
+        muteHikariLogger();
+        setSingleConsoleAppenderWithLayout("%msg%n");
     }
 
     private static void configureDebug() {
+        setRootLoggerLevel(Level.DEBUG);
+        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);
-        root.setLevel(Level.DEBUG);
+        root.setLevel(level);
+    }
 
-        setSingleConsoleAppenderWithLayout(root, "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n");
+    private static void muteHikariLogger() {
+        ((Logger) LoggerFactory.getLogger(HikariDataSource.class)).setLevel(Level.OFF);
     }
 
-    private static void setSingleConsoleAppenderWithLayout( Logger logger, String patternLayout ) {
+    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/ReportersCommand.java b/src/main/java/org/utplsql/cli/ReportersCommand.java
@@ -36,8 +36,6 @@ private ConnectionInfo getConnectionInfo() {
     @Override
     public int run() {
 
-        LoggerConfiguration.configure(true, false );
-
         try {
             DataSource ds = DataSourceProvider.getDataSource(getConnectionInfo(), 1);
             try (Connection con = ds.getConnection()) {

diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -125,7 +125,16 @@ public List<String> getTestPaths() {
     }
 
     void init() {
-        LoggerConfiguration.configure(logSilent, logDebug);
+
+        LoggerConfiguration.ConfigLevel level = LoggerConfiguration.ConfigLevel.BASIC;
+        if ( logSilent ) {
+            level = LoggerConfiguration.ConfigLevel.NONE;
+        }
+        else if ( logDebug ) {
+            level = LoggerConfiguration.ConfigLevel.DEBUG;
+        }
+
+        LoggerConfiguration.configure(level);
     }
 
     public int run() {
@@ -251,7 +260,7 @@ private void initDatabase(DataSource dataSource) throws SQLException {
             // First of all do a compatibility check and fail-fast
             compatibilityProxy = checkFrameworkCompatibility(conn);
 
-            logger.info("Successfully connected to database. UtPLSQL core: " + compatibilityProxy.getDatabaseVersion());
+            logger.info("Successfully connected to database. UtPLSQL core: {}", compatibilityProxy.getDatabaseVersion());
             logger.info("Oracle-Version: {}", new DefaultDatabaseInformation().getOracleVersion(conn));
         }
         catch (SQLException e) {

diff --git a/src/main/java/org/utplsql/cli/VersionInfoCommand.java b/src/main/java/org/utplsql/cli/VersionInfoCommand.java
@@ -34,8 +34,6 @@ public ConnectionInfo getConnectionInfo() {
 
     public int run() {
 
-        LoggerConfiguration.configure(true, false );
-
         System.out.println(CliVersionInfo.getInfo());
         System.out.println(JavaApiVersionInfo.getInfo());
 

diff --git a/...g/utplsql/cli/RunCommandLogLevelTest.java → ...tplsql/cli/RunCommandConfigLevelTest.java b/...g/utplsql/cli/RunCommandLogLevelTest.java → ...tplsql/cli/RunCommandConfigLevelTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class RunCommandLogLevelTest {
+public class RunCommandConfigLevelTest {
 
     private Logger getRootLogger() {
         return (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);