DBTOOLS-1700 messages refactoring

rYamal4 · AXEPOH · commit 3ed1da786add · 2025-08-27T16:22:36.000+05:00
diff --git a/src/main/java/org/pgcodekeeper/cli/Application.java b/src/main/java/org/pgcodekeeper/cli/Application.java
@@ -42,7 +42,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.SQLException;
-import java.text.MessageFormat;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -127,8 +126,9 @@ private static boolean diff(PrintWriter writer, CliArgs arguments)
                 if (!dangerTypes.isEmpty()) {
                     String dangerStmt = dangerTypes.stream().map(DangerStatement::name)
                             .collect(Collectors.joining(", ")); //$NON-NLS-1$
-                    LOG.warn(Messages.Main_log_contains_dangerous_statements, dangerStmt);
-                    String msg = MessageFormat.format(Messages.Main_danger_statements, dangerStmt);
+                    var logMsg = Messages.Main_log_contains_dangerous_statements.formatted(dangerStmt);
+                    LOG.warn(logMsg);
+                    String msg = Messages.Main_danger_statements.formatted(dangerStmt);
                     writer.println(msg);
                     if (encodedWriter != null) {
                         encodedWriter.println("-- " + msg); //$NON-NLS-1$
diff --git a/src/main/java/org/pgcodekeeper/cli/CliArgs.java b/src/main/java/org/pgcodekeeper/cli/CliArgs.java
@@ -20,7 +20,6 @@
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -805,14 +804,14 @@ private void checkDbTypesParam() throws CmdLineException {
 
     private void badArgWithCorrectModes(boolean condition, String param, CliMode... modes) throws CmdLineException {
         if (condition && !containsInArray(mode, modes)) {
-            badArgs(MessageFormat.format(Messages.CliArgs_error_wrong_mode, param, mode));
+            badArgs(Messages.CliArgs_error_wrong_mode.formatted(param, mode));
         }
     }
 
     private void badArgWithWrongDbType(boolean condition, String arg, DatabaseType... wrongDbTypes)
             throws CmdLineException {
         if (condition && containsInArray(dbType, wrongDbTypes)) {
-            badArgs(MessageFormat.format(Messages.CliArgs_error_wrong_db_type, arg, dbType));
+            badArgs(Messages.CliArgs_error_wrong_db_type.formatted(arg, dbType));
         }
     }
 
@@ -840,13 +839,13 @@ private void printUsage(PrintWriter writer) {
         new CmdLineParser(new CliArgs(), prop).printUsage(new OutputStreamWriter(buf, StandardCharsets.UTF_8),
                 new CliArgsLocalizationsBundle());
 
-        writer.println(MessageFormat.format(Messages.UsageHelp.replace("${tab}", "\t"), //$NON-NLS-1$ //$NON-NLS-2$
+        writer.println(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(MessageFormat.format(Messages.Version, Utils.getVersion()));
+        writer.println(Messages.Version.formatted(Utils.getVersion()));
     }
 
     private void listCharsets(PrintWriter writer) {
diff --git a/src/main/java/org/pgcodekeeper/cli/exception/LibraryObjectDuplicationException.java b/src/main/java/org/pgcodekeeper/cli/exception/LibraryObjectDuplicationException.java
@@ -17,14 +17,13 @@
 
 import org.pgcodekeeper.core.schema.PgOverride;
 
-import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
 
 public class LibraryObjectDuplicationException extends RuntimeException {
 
-    private static final String ENTRY = "{0} {1} in {2} conflicts with object in {3}"; //$NON-NLS-1$
+    private static final String ENTRY = "%s %s in %s conflicts with object in %s"; //$NON-NLS-1$
 
     private static final long serialVersionUID = -4197153074585872486L;
 
@@ -51,7 +50,7 @@ public LibraryObjectDuplicationException(String message, Throwable cause,
 
     public LibraryObjectDuplicationException(Collection<PgOverride> overrides) {
         super("Library conflicts:\n" + overrides.stream() //$NON-NLS-1$
-        .map(o -> MessageFormat.format(ENTRY, o.getType(), o.getName(), o.getOldPath(), o.getNewPath()))
+        .map(o -> ENTRY.formatted(o.getType(), o.getName(), o.getOldPath(), o.getNewPath()))
         .collect(Collectors.joining("\n"))); //$NON-NLS-1$
     }
 }
diff --git a/src/main/java/org/pgcodekeeper/cli/localizations/Messages.java b/src/main/java/org/pgcodekeeper/cli/localizations/Messages.java
@@ -140,7 +140,6 @@ public class Messages {
 
 
     static {
-        // TODO replace with ENUM
         ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME);
         for (String key : bundle.keySet()) {
             try {
diff --git a/src/main/resources/org/pgcodekeeper/cli/localizations/messages.properties b/src/main/resources/org/pgcodekeeper/cli/localizations/messages.properties
@@ -39,9 +39,9 @@ CliArgs_error_source_null = Please specify SOURCE.
 
 CliArgs_error_target_non_db = Script can be applied only to database.
 
-CliArgs_error_wrong_db_type = {0} cannot be used with --db-type {1} option
+CliArgs_error_wrong_db_type = %s cannot be used with --db-type %s option
 
-CliArgs_error_wrong_mode = {0} cannot be used with --mode {1} option
+CliArgs_error_wrong_mode = %s cannot be used with --mode %s option
 
 CliArgs_generate_constraint_not_valid = print CONSTRAINT NOT VALID for no partitioned tables
 
@@ -147,13 +147,13 @@ DatabaseType_unsupported_type = Unsupported database type:
 
 Main_cach_clear = Library cache cleared
 
-Main_danger_statements = Script contains dangerous statements: {0}. Use --allow-danger-ddl to override.
+Main_danger_statements = Script contains dangerous statements: %s. Use --allow-danger-ddl to override.
 
 Main_log_apply_migration_script = Apply migration script on target database
 
 Main_log_build_graph_deps = Building graph dependencies
 
-Main_log_contains_dangerous_statements = Migration script contains dangerous statements: {}
+Main_log_contains_dangerous_statements = Migration script contains dangerous statements: %s
 
 Main_log_create_script = Starting creating script
 
@@ -197,10 +197,10 @@ PgDiffCli_log_load_old_db_overrides = Load old database's overrides
 
 PgDiffCli_log_start_db_analyze = Start database analysis
 
-UnknownDBFormat = Unknown DB format: {0}
+UnknownDBFormat = Unknown DB format: %s
 
-UsageHelp = Usage\n${tab}pgcodekeeper-cli [option]... SOURCE DEST\n${tab}pgcodekeeper-cli -s SOURCE -t DEST [option]...\n${tab}pgcodekeeper-cli --mode PARSE -o OUTDIR [--update-project] [option]... SOURCE\n${tab}pgcodekeeper-cli --mode GRAPH [option]... SOURCE\n${tab}pgcodekeeper-cli --mode INSERT --insert-name <name> --insert-filter <filter> [option]... SOURCE\n${tab}pgcodekeeper-cli --mode VERIFY --verify-rule-set <path> --verify-source <path> [option]...\n\n{0}\n{1}\n\nLibrary load order\n${tab}Libraries are loaded in the following order:\n${tab}${tab}1. Libraries in specified XML lists.\n${tab}${tab}2. Explicitly specified libraries.\n${tab}${tab}3. Explicitly specified libraries without privileges.\n${tab}In each group order is defined by the given argument order. Within XMLs entry order is used.\n${tab}Objects loaded first in this sequence may override ones loaded later (if --lib-safe-mode is off).\n\nLive database connections\n${tab}Use JDBC connection URL to specify live databases\n${tab}${tab}PostgreSQL: https://jdbc.postgresql.org/documentation/head/connect.html\n${tab}${tab}MS SQL: https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url\n${tab}${tab}ClickHouse: https://clickhouse.com/docs/en/integrations/java#configuration
+UsageHelp = Usage\n${tab}pgcodekeeper-cli [option]... SOURCE DEST\n${tab}pgcodekeeper-cli -s SOURCE -t DEST [option]...\n${tab}pgcodekeeper-cli --mode PARSE -o OUTDIR [--update-project] [option]... SOURCE\n${tab}pgcodekeeper-cli --mode GRAPH [option]... SOURCE\n${tab}pgcodekeeper-cli --mode INSERT --insert-name <name> --insert-filter <filter> [option]... SOURCE\n${tab}pgcodekeeper-cli --mode VERIFY --verify-rule-set <path> --verify-source <path> [option]...\n\n%s\n%s\n\nLibrary load order\n${tab}Libraries are loaded in the following order:\n${tab}${tab}1. Libraries in specified XML lists.\n${tab}${tab}2. Explicitly specified libraries.\n${tab}${tab}3. Explicitly specified libraries without privileges.\n${tab}In each group order is defined by the given argument order. Within XMLs entry order is used.\n${tab}Objects loaded first in this sequence may override ones loaded later (if --lib-safe-mode is off).\n\nLive database connections\n${tab}Use JDBC connection URL to specify live databases\n${tab}${tab}PostgreSQL: https://jdbc.postgresql.org/documentation/head/connect.html\n${tab}${tab}MS SQL: https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url\n${tab}${tab}ClickHouse: https://clickhouse.com/docs/en/integrations/java#configuration
 
 Utils_error_get_version = error: no OSGI running
 
-Version = Version: {0}
+Version = Version: %s
diff --git a/src/main/resources/org/pgcodekeeper/cli/localizations/messages_ru_RU.properties b/src/main/resources/org/pgcodekeeper/cli/localizations/messages_ru_RU.properties
@@ -39,9 +39,9 @@ CliArgs_error_source_null = \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u04
 
 CliArgs_error_target_non_db = \u0421\u043A\u0440\u0438\u043F\u0442 \u043C\u043E\u0436\u043D\u043E \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u043A \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445.
 
-CliArgs_error_wrong_db_type = {0} \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C --db-type {1}
+CliArgs_error_wrong_db_type = %s \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C --db-type %s
 
-CliArgs_error_wrong_mode = {0} \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F c \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C --mode {1}
+CliArgs_error_wrong_mode = %s \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F c \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C --mode %s
 
 CliArgs_generate_constraint_not_valid = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C CONSTRAINT NOT VALID \u0434\u043B\u044F \u043D\u0435 \u043F\u0430\u0440\u0442\u0438\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0442\u0430\u0431\u043B\u0438\u0446
 
@@ -147,13 +147,13 @@ DatabaseType_unsupported_type = \u041D\u0435\u043F\u043E\u0434\u0434\u0435\u0440
 
 Main_cach_clear = \u041A\u044D\u0448 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A \u043E\u0447\u0438\u0449\u0435\u043D
 
-Main_danger_statements = \u0421\u043A\u0440\u0438\u043F\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043E\u043F\u0430\u0441\u043D\u044B\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u044B: {0}. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 --allow-danger-ddl \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u044F.
+Main_danger_statements = \u0421\u043A\u0440\u0438\u043F\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043E\u043F\u0430\u0441\u043D\u044B\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u044B: %s. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 --allow-danger-ddl \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u044F.
 
 Main_log_apply_migration_script = \u041F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u0430 \u043C\u0438\u0433\u0440\u0430\u0446\u0438\u0438 \u043A \u0446\u0435\u043B\u0435\u0432\u043E\u0439 \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445
 
 Main_log_build_graph_deps = \u041F\u043E\u0441\u0442\u0440\u043E\u0435\u043D\u0438\u0435 \u0433\u0440\u0430\u0444\u0430 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439
 
-Main_log_contains_dangerous_statements = \u0421\u043A\u0440\u0438\u043F\u0442 \u043C\u0438\u0433\u0440\u0430\u0446\u0438\u0438 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043E\u043F\u0430\u0441\u043D\u044B\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F: {}
+Main_log_contains_dangerous_statements = \u0421\u043A\u0440\u0438\u043F\u0442 \u043C\u0438\u0433\u0440\u0430\u0446\u0438\u0438 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043E\u043F\u0430\u0441\u043D\u044B\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F: %s
 
 Main_log_create_script = \u0417\u0430\u043F\u0443\u0441\u043A \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0430
 
@@ -197,10 +197,10 @@ PgDiffCli_log_load_old_db_overrides = \u0417\u0430\u0433\u0440\u0443\u0437\u043A
 
 PgDiffCli_log_start_db_analyze = \u0421\u0442\u0430\u0440\u0442 \u0430\u043D\u0430\u043B\u0438\u0437\u0430 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 
-UnknownDBFormat = \u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445: {0}
+UnknownDBFormat = \u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445: %s
 
-UsageHelp = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435\n${tab}pgcodekeeper-cli [option]... SOURCE DEST\n${tab}pgcodekeeper-cli -s SOURCE -t DEST [option]...\n${tab}pgcodekeeper-cli --mode PARSE -o OUTDIR [--update-project] [option]... SOURCE\n${tab}pgcodekeeper-cli --mode GRAPH [option]... SOURCE\n${tab}pgcodekeeper-cli --mode INSERT --insert-name <name> --insert-filter <filter> [option]... SOURCE\n${tab}pgcodekeeper-cli --mode VERIFY --verify-rule-set <path> --verify-source <path> [option]...\n\n{0}\n{1}\n\n\u041F\u043E\u0440\u044F\u0434\u043E\u043A \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\n${tab}\u0411\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u044E\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u043C \u043F\u043E\u0440\u044F\u0434\u043A\u0435:\n${tab}${tab}1. \u0411\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0432 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0445 \u0441\u043F\u0438\u0441\u043A\u0430\u0445 XML.\n${tab}${tab}2. \u042F\u0432\u043D\u043E \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0435 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438.\n${tab}${tab}3. \u042F\u0432\u043D\u043E \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0435 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0439.\n${tab}\u0412 \u043A\u0430\u0436\u0434\u043E\u0439 \u0433\u0440\u0443\u043F\u043F\u0435 \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442\u0441\u044F \u0437\u0430\u0434\u0430\u043D\u043D\u044B\u043C \u043F\u043E\u0440\u044F\u0434\u043A\u043E\u043C \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430. \u0412 \u043F\u0440\u0435\u0434\u0435\u043B\u0430\u0445 XML \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u0437\u0430\u043F\u0438\u0441\u0438.\n${tab}\u041E\u0431\u044A\u0435\u043A\u0442\u044B, \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043D\u044B\u0435 \u043F\u0435\u0440\u0432\u044B\u043C\u0438 \u0432 \u044D\u0442\u043E\u0439 \u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438, \u043C\u043E\u0433\u0443\u0442 \u043F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442\u044C \u0442\u0435, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u044B \u043F\u043E\u0437\u0436\u0435 (\u0435\u0441\u043B\u0438 --lib-safe-mode \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D).\n\n\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u043A \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0439 \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445\n${tab}\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 URL-\u0430\u0434\u0440\u0435\u0441 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F JDBC \u0434\u043B\u044F \u0443\u043A\u0430\u0437\u0430\u043D\u0438\u044F \u0430\u043A\u0442\u0438\u0432\u043D\u044B\u0445 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445\n${tab}${tab}PostgreSQL: https://jdbc.postgresql.org/documentation/head/connect.html\n${tab}${tab}MS SQL: https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url\n${tab}${tab}ClickHouse: https://clickhouse.com/docs/en/integrations/java#configuration
+UsageHelp = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435\n${tab}pgcodekeeper-cli [option]... SOURCE DEST\n${tab}pgcodekeeper-cli -s SOURCE -t DEST [option]...\n${tab}pgcodekeeper-cli --mode PARSE -o OUTDIR [--update-project] [option]... SOURCE\n${tab}pgcodekeeper-cli --mode GRAPH [option]... SOURCE\n${tab}pgcodekeeper-cli --mode INSERT --insert-name <name> --insert-filter <filter> [option]... SOURCE\n${tab}pgcodekeeper-cli --mode VERIFY --verify-rule-set <path> --verify-source <path> [option]...\n\n%s\n%s\n\n\u041F\u043E\u0440\u044F\u0434\u043E\u043A \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\n${tab}\u0411\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u044E\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u043C \u043F\u043E\u0440\u044F\u0434\u043A\u0435:\n${tab}${tab}1. \u0411\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0432 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0445 \u0441\u043F\u0438\u0441\u043A\u0430\u0445 XML.\n${tab}${tab}2. \u042F\u0432\u043D\u043E \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0435 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438.\n${tab}${tab}3. \u042F\u0432\u043D\u043E \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0435 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0439.\n${tab}\u0412 \u043A\u0430\u0436\u0434\u043E\u0439 \u0433\u0440\u0443\u043F\u043F\u0435 \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442\u0441\u044F \u0437\u0430\u0434\u0430\u043D\u043D\u044B\u043C \u043F\u043E\u0440\u044F\u0434\u043A\u043E\u043C \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430. \u0412 \u043F\u0440\u0435\u0434\u0435\u043B\u0430\u0445 XML \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u0437\u0430\u043F\u0438\u0441\u0438.\n${tab}\u041E\u0431\u044A\u0435\u043A\u0442\u044B, \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043D\u044B\u0435 \u043F\u0435\u0440\u0432\u044B\u043C\u0438 \u0432 \u044D\u0442\u043E\u0439 \u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438, \u043C\u043E\u0433\u0443\u0442 \u043F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442\u044C \u0442\u0435, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u044B \u043F\u043E\u0437\u0436\u0435 (\u0435\u0441\u043B\u0438 --lib-safe-mode \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D).\n\n\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u043A \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0439 \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445\n${tab}\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 URL-\u0430\u0434\u0440\u0435\u0441 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F JDBC \u0434\u043B\u044F \u0443\u043A\u0430\u0437\u0430\u043D\u0438\u044F \u0430\u043A\u0442\u0438\u0432\u043D\u044B\u0445 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445\n${tab}${tab}PostgreSQL: https://jdbc.postgresql.org/documentation/head/connect.html\n${tab}${tab}MS SQL: https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url\n${tab}${tab}ClickHouse: https://clickhouse.com/docs/en/integrations/java#configuration
 
 Utils_error_get_version = \u043E\u0448\u0438\u0431\u043A\u0430: OSGI \u043D\u0435 \u0437\u0430\u043F\u0443\u0449\u0435\u043D
 
-Version = \u0412\u0435\u0440\u0441\u0438\u044F: {0}
+Version = \u0412\u0435\u0440\u0441\u0438\u044F: %s
diff --git a/src/test/java/org/pgcodekeeper/cli/OutputTest.java b/src/test/java/org/pgcodekeeper/cli/OutputTest.java

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import java.io.PrintWriter;`
`21`	`21`	`import java.nio.charset.Charset;`
`22`	`22`	`import java.nio.charset.StandardCharsets;`
`23`		`-import java.text.MessageFormat;`
`24`	`23`	`import java.util.ArrayList;`
`25`	`24`	`import java.util.Collection;`
`26`	`25`	`import java.util.Collections;`
`@@ -805,14 +804,14 @@ private void checkDbTypesParam() throws CmdLineException {`
`805`	`804`
`806`	`805`	`private void badArgWithCorrectModes(boolean condition, String param, CliMode... modes) throws CmdLineException {`
`807`	`806`	`if (condition && !containsInArray(mode, modes)) {`
`808`		`- badArgs(MessageFormat.format(Messages.CliArgs_error_wrong_mode, param, mode));`
	`807`	`+ badArgs(Messages.CliArgs_error_wrong_mode.formatted(param, mode));`
`809`	`808`	`}`
`810`	`809`	`}`
`811`	`810`
`812`	`811`	`private void badArgWithWrongDbType(boolean condition, String arg, DatabaseType... wrongDbTypes)`
`813`	`812`	`throws CmdLineException {`
`814`	`813`	`if (condition && containsInArray(dbType, wrongDbTypes)) {`
`815`		`- badArgs(MessageFormat.format(Messages.CliArgs_error_wrong_db_type, arg, dbType));`
	`814`	`+ badArgs(Messages.CliArgs_error_wrong_db_type.formatted(arg, dbType));`
`816`	`815`	`}`
`817`	`816`	`}`
`818`	`817`
`@@ -840,13 +839,13 @@ private void printUsage(PrintWriter writer) {`
`840`	`839`	`new CmdLineParser(new CliArgs(), prop).printUsage(new OutputStreamWriter(buf, StandardCharsets.UTF_8),`
`841`	`840`	`new CliArgsLocalizationsBundle());`
`842`	`841`
`843`		`- writer.println(MessageFormat.format(Messages.UsageHelp.replace("${tab}", "\t"), //$NON-NLS-1$ //$NON-NLS-2$`
	`842`	`+ writer.println(Messages.UsageHelp.replace("${tab}", "\t").formatted( //$NON-NLS-1$ //$NON-NLS-2$`
`844`	`843`	`buf.toString(StandardCharsets.UTF_8),`
`845`	`844`	`DangerStatementOptionHandler.getMetaVariable() + '\n' + DbObjTypeOptionHandler.getMetaVariable()));`
`846`	`845`	`}`
`847`	`846`
`848`	`847`	`private void printVersion(PrintWriter writer) {`
`849`		`- writer.println(MessageFormat.format(Messages.Version, Utils.getVersion()));`
	`848`	`+ writer.println(Messages.Version.formatted(Utils.getVersion()));`
`850`	`849`	`}`
`851`	`850`
`852`	`851`	`private void listCharsets(PrintWriter writer) {`