add getLocalMessage method

Author: zijiacj

server/integration-test/src/test/java/com/oceanbase/odc/service/notification/helper/MessageTemplateProcessorTest.java

@@ -61,4 +61,36 @@ public void testReplaceVariables_VariableNotExists_ReplaceEmptyString() {
 
         Assert.assertEquals(expected, actual);
     }
+
+    @Test
+    public void testGetLocalMessage_NullLocale_ReturnTemplate() {
+        String template = "fake template";
+        String message = MessageTemplateProcessor.getLocalMessage(null, template);
+        Assert.assertEquals(template, message);
+    }
+
+    @Test
+    public void testGetLocalMessage_VariousLocale_Success() {
+        Locale locale1 = new Locale("en", "US");
+        String template1 = "${com.oceanbase.odc.builtin-resource.collaboration.environment.dev.name}";
+        String message1 = MessageTemplateProcessor.getLocalMessage(locale1, template1);
+        Assert.assertEquals("dev", message1);
+        Locale locale2 = new Locale("zh", "TW");
+        String template2 = "${com.oceanbase.odc.builtin-resource.collaboration.environment.dev.name}";
+        String message2 = MessageTemplateProcessor.getLocalMessage(locale2, template2);
+        Assert.assertEquals("開發", message2);
+        Locale locale3 = new Locale("zh", "CN");
+        String template3 = "${com.oceanbase.odc.builtin-resource.collaboration.environment.dev.name}";
+        String message3 = MessageTemplateProcessor.getLocalMessage(locale3, template3);
+        Assert.assertEquals("开发", message3);
+    }
+
+    @Test
+    public void testGetLocalMessage_NullTemplate_ReturnNull() {
+        Locale locale = new Locale("zh", "CN");
+        String template = null;
+        String message = MessageTemplateProcessor.getLocalMessage(locale, template);
+        Assert.assertEquals(null, message);
+    }
+
 }

server/odc-common/src/main/java/com/oceanbase/odc/common/i18n/I18nOutputSerializer.java

@@ -16,9 +16,9 @@
 package com.oceanbase.odc.common.i18n;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,7 +31,7 @@
 
 public class I18nOutputSerializer extends JsonSerializer<String> {
     private static final Pattern I18N_RESOURCE_PATTERN = Pattern.compile("\\$\\{([^{^}]*)\\}");
-    private static final Map<Locale, Map<String, String>> MESSAGES_MAP = new HashMap<>();
+    private static final Map<Locale, Map<String, String>> MESSAGES_MAP = new ConcurrentHashMap<>();
 
     @Override
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
@@ -49,9 +49,8 @@ protected String convertString(String resource) {
         if (!matcher.find()) {
             return resource;
         }
-
         Locale currentLocale = LocaleContextHolder.getLocale();
-        MESSAGES_MAP.putIfAbsent(currentLocale, new HashMap<>());
+        MESSAGES_MAP.putIfAbsent(currentLocale, new ConcurrentHashMap<>());
         int cursor = 0;
         while (matcher.find(cursor)) {
             String key = matcher.group();

server/odc-core/src/main/resources/i18n/BusinessMessages.properties

@@ -882,5 +882,3 @@ com.oceanbase.odc.PartitionPlanVariableKey.LAST_PARTITION_VALUE=The value of the
 com.oceanbase.odc.partitionplan.TimeDataType=Time type
 com.oceanbase.odc.partitionplan.NumberDataType=Number type
 
-# DatabaseChangeTranslate:
-com.oceanbase.odc.DatabaseChangeTranslate.BATCH_NUMBER=batch no.

server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java

@@ -49,10 +49,10 @@
 import com.oceanbase.odc.service.flow.model.QueryFlowInstanceParams;
 import com.oceanbase.odc.service.flow.task.model.MultipleDatabaseChangeParameters;
 import com.oceanbase.odc.service.flow.task.model.MultipleDatabaseChangeTaskResult;
-import com.oceanbase.odc.service.flow.util.DescriptionGenerator;
 import com.oceanbase.odc.service.flow.util.FlowTaskUtil;
 import com.oceanbase.odc.service.iam.model.User;
 import com.oceanbase.odc.service.iam.util.SecurityContextUtils;
+import com.oceanbase.odc.service.notification.helper.MessageTemplateProcessor;
 import com.oceanbase.odc.service.task.TaskService;
 
 import lombok.extern.slf4j.Slf4j;
@@ -339,10 +339,10 @@ private String generateDescription(Locale locale, DatabaseChangeDatabase databas
         String i18nKey = "com.oceanbase.odc.builtin-resource.multiple-async.sub-ticket.description";
         String description = I18n.translate(
                 i18nKey,
-                new Object[] {DescriptionGenerator.localEnvName(database.getEnvironment().getName(), locale),
+                new Object[] {database.getEnvironment().getName(),
                         flowInstanceId, batchId + 1,
                         database.getDataSource().getName(), database.getName()},
                 locale);
-        return description;
+        return MessageTemplateProcessor.getLocalMessage(locale, description);
     }
 }

server/odc-service/src/main/java/com/oceanbase/odc/service/flow/util/DescriptionGenerator.java

@@ -19,17 +19,15 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import javax.validation.constraints.NotNull;
-
 import org.springframework.context.i18n.LocaleContextHolder;
 
-import com.oceanbase.odc.common.i18n.I18n;
 import com.oceanbase.odc.common.util.StringUtils;
 import com.oceanbase.odc.core.shared.constant.Symbols;
 import com.oceanbase.odc.core.shared.constant.TaskType;
 import com.oceanbase.odc.service.databasechange.model.DatabaseChangeDatabase;
 import com.oceanbase.odc.service.flow.model.CreateFlowInstanceReq;
 import com.oceanbase.odc.service.flow.task.model.MultipleDatabaseChangeParameters;
+import com.oceanbase.odc.service.notification.helper.MessageTemplateProcessor;
 
 /**
  * @Author：tinker
@@ -39,30 +37,24 @@
 public class DescriptionGenerator {
 
     public static void generateDescription(CreateFlowInstanceReq req) {
-        Locale locale = LocaleContextHolder.getLocale();
         if (StringUtils.isEmpty(req.getDescription())) {
+            Locale locale = LocaleContextHolder.getLocale();
             // descriptions is recommended for localization.Facilitate fuzzy query
             String descFormat = Symbols.LEFT_BRACKET.getLocalizedMessage() + "%s"
                     + Symbols.RIGHT_BRACKET.getLocalizedMessage() + "%s.%s";
             if (req.getTaskType() == TaskType.MULTIPLE_ASYNC) {
                 MultipleDatabaseChangeParameters parameters = (MultipleDatabaseChangeParameters) req.getParameters();
                 List<DatabaseChangeDatabase> databases = parameters.getDatabases();
                 String description = databases.stream()
-                        .map(db -> String.format(descFormat, localEnvName(db.getEnvironment().getName(), locale),
+                        .map(db -> String.format(descFormat, db.getEnvironment().getName(),
                                 db.getDataSource().getName(), db.getName()))
                         .collect(Collectors.joining(Symbols.COMMA.getLocalizedMessage()));
-                req.setDescription(description);
+                req.setDescription(MessageTemplateProcessor.getLocalMessage(locale, description));
             } else {
-                req.setDescription(String.format(descFormat,
-                        localEnvName(req.getEnvironmentName(), locale), req.getConnectionName(),
-                        req.getDatabaseName()));
+                req.setDescription(MessageTemplateProcessor.getLocalMessage(locale, String.format(descFormat,
+                        req.getEnvironmentName(), req.getConnectionName(),
+                        req.getDatabaseName())));
             }
         }
     }
-
-    public static String localEnvName(@NotNull String envName, @NotNull Locale locale) {
-        String envKey = envName.substring(2, envName.length() - 1);
-        return I18n.translate(envKey, null, envKey, locale);
-    }
-
 }

server/odc-service/src/main/java/com/oceanbase/odc/service/notification/helper/MessageTemplateProcessor.java

@@ -19,6 +19,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.text.StringSubstitutor;
 import org.springframework.util.CollectionUtils;
@@ -32,7 +33,7 @@
  * @Description: []
  */
 public class MessageTemplateProcessor {
-    private static final Map<Locale, StringSubstitutor> LOCALE2SUBSTITUTOR = new HashMap<>();
+    private static final Map<Locale, StringSubstitutor> LOCALE2SUBSTITUTOR = new ConcurrentHashMap<>();
 
     public static String replaceVariables(final String template, Locale locale, final Map<String, String> variables) {
         if (StringUtils.isEmpty(template)) {
@@ -55,7 +56,18 @@ public static String replaceVariables(final String template, Locale locale, fina
                 .setDisableSubstitutionInValues(true)
                 .setVariableResolver(key -> copiedVariables.getOrDefault(key, ""));
         String message = sub.replace(template);
+        message = getLocalMessage(locale, message);
+        return message;
+    }
 
+    /**
+     * Localise the string containing '${key}'
+     * 
+     * @param locale
+     * @param message
+     * @return
+     */
+    public static String getLocalMessage(Locale locale, String message) {
         if (Objects.nonNull(locale)) {
             StringSubstitutor i18n =
                     LOCALE2SUBSTITUTOR.computeIfAbsent(locale, l -> new StringSubstitutor(I18n.getAllMessages(l)));