Merge branch 'DBTOOLS-1733-fix-encoding' into 'master'

DBTOOLS-1733 fixed encoding of text output to console

See merge request codekeeper/pgcodekeeper-cli!12

Author: AXEPOH

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Fixed encoding of text output to console.
 - Fixed reading logic when xml file is missing.
 - Fixed a race condition when loading a library from an archive.
 - Fixed parser rule for floating point constants for MS SQL.

CHANGELOG.ru.md

@@ -15,6 +15,7 @@
 
 ### Исправлено
 
+- Исправлена кодировка выводимого в консоль текста.
 - Исправлена логика чтения при отсутствующем xml файле.
 - Исправлено состояние гонки при загрузке библиотеки из архива.
 - Исправлено правило парсера для чисел с плавающей запятой для MS SQL.

src/main/java/org/pgcodekeeper/cli/Application.java

@@ -43,6 +43,7 @@
 import java.nio.file.Paths;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -66,27 +67,26 @@ public static void main(String[] args) {
      * @return success value
      */
     static boolean process(String[] args) {
-        PrintWriter writer = new PrintWriter(System.out, true);
         CliArgs arguments = new CliArgs();
         try {
-            if (!arguments.parse(writer, args)) {
+            if (!arguments.parse(args)) {
                 return true;
             }
             if (arguments.isClearLibCache()) {
                 clearCache();
             }
 
             return switch (arguments.getMode()) {
-                case INSERT -> insert(writer, arguments);
+                case INSERT -> insert(arguments);
                 case PARSE -> parse(arguments);
-                case GRAPH -> graph(writer, arguments);
-                case VERIFY -> verify(writer, arguments);
+                case GRAPH -> graph(arguments);
+                case VERIFY -> verify(arguments);
                 default -> {
                     if (arguments.getOldSrc() == null || arguments.getNewSrc() == null) {
                         // clear cache
                         yield true;
                     }
-                    yield diff(writer, arguments);
+                    yield diff(arguments);
                 }
             };
         } catch (CmdLineException ex) {
@@ -105,7 +105,7 @@ static boolean process(String[] args) {
         }
     }
 
-    private static boolean diff(PrintWriter writer, CliArgs arguments)
+    private static boolean diff(CliArgs arguments)
             throws InterruptedException, IOException, SQLException {
         try (PrintWriter encodedWriter = getDiffWriter(arguments)) {
             var diff = new PgDiffCli(arguments);
@@ -129,7 +129,7 @@ private static boolean diff(PrintWriter writer, CliArgs arguments)
                     var logMsg = Messages.Main_log_contains_dangerous_statements.formatted(dangerStmt);
                     LOG.warn(logMsg);
                     String msg = Messages.Main_danger_statements.formatted(dangerStmt);
-                    writer.println(msg);
+                    writeToConsole(msg);
                     if (encodedWriter != null) {
                         encodedWriter.println("-- " + msg); //$NON-NLS-1$
                     }
@@ -150,7 +150,7 @@ private static boolean diff(PrintWriter writer, CliArgs arguments)
                 LOG.info(Messages.Main_log_apply_migration_script);
                 new JdbcRunner().runBatches(new UrlJdbcConnector(url), parser.batch(), null);
             } else if (encodedWriter == null) {
-                writer.println(text);
+                writeToConsole(text);
             }
         }
 
@@ -183,7 +183,7 @@ private static boolean parse(CliArgs arguments) throws IOException, InterruptedE
         return true;
     }
 
-    private static boolean insert(PrintWriter writer, CliArgs arguments)
+    private static boolean insert(CliArgs arguments)
             throws IOException, InterruptedException, SQLException {
         var diff = new PgDiffCli(arguments);
         AbstractDatabase db;
@@ -208,15 +208,15 @@ private static boolean insert(PrintWriter writer, CliArgs arguments)
                 new JdbcRunner().runBatches(new UrlJdbcConnector(url),
                         new ScriptParser("CLI", script, arguments).batch(), null); //$NON-NLS-1$
             } else if (pw == null) {
-                writer.println(script);
+                writeToConsole(script);
             }
         }
 
         LOG.info(Messages.Main_log_succes_finish);
         return true;
     }
 
-    private static boolean graph(PrintWriter writer, CliArgs arguments) throws IOException, InterruptedException {
+    private static boolean graph(CliArgs arguments) throws IOException, InterruptedException {
         var diff = new PgDiffCli(arguments);
         AbstractDatabase d;
         try {
@@ -230,27 +230,28 @@ private static boolean graph(PrintWriter writer, CliArgs arguments) throws IOExc
                 arguments.getGraphFilterTypes(), arguments.isGraphInvertFilter(), d, arguments.getGraphNames());
 
         try (PrintWriter pw = getDiffWriter(arguments)) {
-            var w = pw != null ? pw : writer;
-            for (String dep : dependencies) {
-                w.println(dep);
-            }
+            Consumer<String> consumer = pw != null ? pw::println : Application::writeToConsole;
+            dependencies.forEach(consumer);
         }
 
         LOG.info(Messages.Main_log_succes_finish);
         return true;
     }
 
-    private static boolean verify(PrintWriter writer, CliArgs arguments)
+    private static boolean verify(CliArgs arguments)
             throws IOException, InterruptedException {
         Path path = Paths.get(arguments.getVerifyRuleSetPath());
         LOG.info(Messages.Main_log_start_code_verify);
         List<Object> errors = TokenLoader.verify(arguments, path, arguments.getVerifySources());
-        if (!errors.isEmpty()) {
-            errors.forEach(writer::println);
-            return false;
+        if (errors.isEmpty()) {
+            LOG.info(Messages.Main_log_finish_code_verify);
+            return true;
         }
-        LOG.info(Messages.Main_log_finish_code_verify);
-        return true;
+
+        for (Object error : errors) {
+            writeToConsole(error.toString());
+        }
+        return false;
     }
 
     private static void clearCache() throws IOException {
@@ -265,10 +266,14 @@ private static void printError(PgDiffCli diff) {
         }
     }
 
+    private static void writeToConsole(String message) {
+        System.out.println(message);
+    }
+
     private static void writeMessage(Object message) {
         String msg = message.toString();
         LOG.info(msg);
-        System.out.println(msg);
+        writeToConsole(msg);
     }
 
     private static void writeError(Object message) {

src/main/java/org/pgcodekeeper/cli/CliArgs.java

@@ -31,7 +31,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -611,29 +610,28 @@ public void setIgnorePrivileges(boolean ignorePrivileges) {
     /**
      * Parses command line arguments or outputs instructions.
      *
-     * @param writer writer to be used for info output
      * @param args   array of arguments
      *
      * @return true if arguments were parsed and execution can continue,
      *         otherwise false
      */
-    public boolean parse(PrintWriter writer, String[] args) throws CmdLineException {
+    public boolean parse(String[] args) throws CmdLineException {
         if (args.length != 0) {
             new CmdLineParser(this).parseArgument(args);
         } else {
             // show help instead of failing for 0 args
             zhelp = true;
         }
         if (zhelp) {
-            printUsage(writer);
+            printUsage();
             return false;
         }
         if (zversion) {
-            printVersion(writer);
+            printVersion();
             return false;
         }
         if (zlistCharsets) {
-            listCharsets(writer);
+            listCharsets();
             return false;
         }
 
@@ -801,7 +799,7 @@ private DatabaseType getDatabaseTypeFromSource(String src) {
         return dbType;
     }
 
-    private void printUsage(PrintWriter writer) {
+    private void printUsage() {
         // fix defaults for options like help and other 0-arg booleans
         OptionHandlerRegistry.getRegistry().registerHandler(Boolean.class, BooleanNoDefOptionHandler.class);
         OptionHandlerRegistry.getRegistry().registerHandler(boolean.class, BooleanNoDefOptionHandler.class);
@@ -814,17 +812,21 @@ private void printUsage(PrintWriter writer) {
         new CmdLineParser(new CliArgs(), prop).printUsage(new OutputStreamWriter(buf, StandardCharsets.UTF_8),
                 new CliArgsLocalizationsBundle());
 
-        writer.println(Messages.UsageHelp.replace("${tab}", "\t").formatted( //$NON-NLS-1$ //$NON-NLS-2$
+        writeToConsole(Messages.UsageHelp.replace("${tab}", "\t").formatted( //$NON-NLS-1$ //$NON-NLS-2$
                 buf.toString(StandardCharsets.UTF_8),
                 DangerStatementOptionHandler.getMetaVariable() + '\n' + DbObjTypeOptionHandler.getMetaVariable()));
     }
 
-    private void printVersion(PrintWriter writer) {
-        writer.println(Messages.Version.formatted(Utils.getVersion()));
+    private void writeToConsole(String message) {
+        System.out.println(message);
     }
 
-    private void listCharsets(PrintWriter writer) {
-        Charset.availableCharsets().keySet().forEach(writer::println);
+    private void printVersion() {
+        writeToConsole(Utils.getVersion());
+    }
+
+    private void listCharsets() {
+        Charset.availableCharsets().keySet().forEach(this::writeToConsole);
     }
 
     private <T> boolean containsInArray(T element, T[] elements) {