use I18nOutputSerializer

Author: zijiacj

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

@@ -16,26 +16,28 @@
 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;
 
 import org.apache.commons.text.StringSubstitutor;
 import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
+@Component
 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 {
-        gen.writeString(convertString(value));
+        gen.writeString(convertString(value, null));
     }
 
     /**
@@ -44,14 +46,19 @@ public void serialize(String value, JsonGenerator gen, SerializerProvider serial
      * @param resource
      * @return
      */
-    protected String convertString(String resource) {
+    public String convertString(String resource, Locale currentLocale) {
         Matcher matcher = I18N_RESOURCE_PATTERN.matcher(resource);
         if (!matcher.find()) {
             return resource;
         }
-
-        Locale currentLocale = LocaleContextHolder.getLocale();
-        MESSAGES_MAP.putIfAbsent(currentLocale, new HashMap<>());
+        /**
+         * The local value of the multi-database subticket must be the same as that used when the father
+         * ticket is created
+         */
+        if (currentLocale == null) {
+            currentLocale = LocaleContextHolder.getLocale();
+        }
+        MESSAGES_MAP.putIfAbsent(currentLocale, new ConcurrentHashMap<>());
         int cursor = 0;
         while (matcher.find(cursor)) {
             String key = matcher.group();

server/odc-service/src/main/java/com/oceanbase/odc/config/BeanConfiguration.java

@@ -24,6 +24,7 @@
 import javax.annotation.PostConstruct;
 import javax.validation.constraints.NotBlank;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -72,6 +73,8 @@
 @Slf4j
 @Configuration
 public class BeanConfiguration {
+    @Autowired
+    private I18nOutputSerializer i18nOutputSerializer;
 
     @Bean
     public PasswordEncoder passwordEncoder() {
@@ -81,7 +84,7 @@ public PasswordEncoder passwordEncoder() {
     @Bean
     public ObjectMapper objectMapper(SensitivePropertyHandler sensitivePropertyHandler) {
         CustomOutputSerializer customOutputSerializer = new CustomOutputSerializer()
-                .addSerializer(Internationalizable.class, new I18nOutputSerializer())
+                .addSerializer(Internationalizable.class, i18nOutputSerializer)
                 .addSerializer(SensitiveOutput.class, new SensitiveOutputSerializer(input -> DEFAULT_MASK_VALUE));
         SimpleModule dialectTypeModule =
                 new SimpleModule().addSerializer(DialectType.class, new DialectTypeOutputSerializer());

server/odc-service/src/main/java/com/oceanbase/odc/service/databasechange/MultipleDatabaseChangePreprocessor.java

@@ -60,6 +60,8 @@ public class MultipleDatabaseChangePreprocessor implements Preprocessor {
     private DatabaseChangeChangingOrderTemplateService templateService;
     @Autowired
     private FlowTaskProperties flowTaskProperties;
+    @Autowired
+    private DescriptionGenerator descriptionGenerator;
 
     @Override
     public void process(CreateFlowInstanceReq req) {
@@ -87,7 +89,7 @@ public void process(CreateFlowInstanceReq req) {
         parameters.setDatabases(databases.stream().map(DatabaseChangeDatabase::new).collect(Collectors.toList()));
         req.setProjectId(parameters.getProjectId());
         req.setProjectName(project.getName());
-        DescriptionGenerator.generateDescription(req);
+        descriptionGenerator.generateDescription(req);
         // Localization of father-son ticket is consistent
         Locale locale = LocaleContextHolder.getLocale();
         parameters.setLocale(locale);

server/odc-service/src/main/java/com/oceanbase/odc/service/flow/processor/CreateFlowInstanceProcessAspect.java

@@ -69,6 +69,8 @@ public class CreateFlowInstanceProcessAspect implements InitializingBean {
     private List<Preprocessor> preprocessors;
     @Autowired
     private ProjectService projectService;
+    @Autowired
+    private DescriptionGenerator descriptionGenerator;
 
     private final Map<JobType, Preprocessor> scheduleTaskPreprocessors = new HashMap<>();
 
@@ -157,7 +159,7 @@ private void adaptCreateFlowInstanceReq(CreateFlowInstanceReq req) {
         req.setDatabaseName(database.getName());
         req.setEnvironmentId(database.getDataSource().getEnvironmentId());
         req.setEnvironmentName(database.getEnvironment().getName());
-        DescriptionGenerator.generateDescription(req);
+        descriptionGenerator.generateDescription(req);
         if (req.getTaskType() == TaskType.EXPORT) {
             DataTransferConfig config = (DataTransferConfig) req.getParameters();
             config.setDatabaseId(req.getDatabaseId());

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

@@ -28,7 +28,9 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.oceanbase.odc.common.i18n.I18n;
+import com.oceanbase.odc.common.i18n.I18nOutputSerializer;
 import com.oceanbase.odc.common.json.JsonUtils;
 import com.oceanbase.odc.core.shared.constant.FlowStatus;
 import com.oceanbase.odc.core.shared.constant.TaskErrorStrategy;
@@ -49,7 +51,6 @@
 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;
@@ -72,13 +73,16 @@ public class MultipleDatabaseChangeRuntimeFlowableTask extends BaseODCFlowTaskDe
     private volatile Integer batchId;
     private volatile FlowTaskExecutionStrategy flowTaskExecutionStrategy;
     private Integer batchSum;
+    private ObjectMapper objectMapper;
 
     @Autowired
     private FlowInstanceService flowInstanceService;
     @Autowired
     private FlowInstanceRepository flowInstanceRepository;
     @Autowired
     private ServiceTaskInstanceRepository serviceTaskInstanceRepository;
+    @Autowired
+    private I18nOutputSerializer i18nOutputSerializer;
 
     @Override
     public boolean cancel(boolean mayInterruptIfRunning, Long taskId, TaskService taskService) {
@@ -339,10 +343,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 i18nOutputSerializer.convertString(description, locale);
     }
 }

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

@@ -16,14 +16,12 @@
 package com.oceanbase.odc.service.flow.util;
 
 import java.util.List;
-import java.util.Locale;
 import java.util.stream.Collectors;
 
-import javax.validation.constraints.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
-import org.springframework.context.i18n.LocaleContextHolder;
-
-import com.oceanbase.odc.common.i18n.I18n;
+import com.oceanbase.odc.common.i18n.I18nOutputSerializer;
 import com.oceanbase.odc.common.util.StringUtils;
 import com.oceanbase.odc.core.shared.constant.Symbols;
 import com.oceanbase.odc.core.shared.constant.TaskType;
@@ -36,33 +34,29 @@
  * @Date: 2023/8/4 11:22
  * @Descripition:
  */
+@Component
 public class DescriptionGenerator {
+    @Autowired
+    private I18nOutputSerializer i18nOutputSerializer;
 
-    public static void generateDescription(CreateFlowInstanceReq req) {
-        Locale locale = LocaleContextHolder.getLocale();
+    public void generateDescription(CreateFlowInstanceReq req) {
         if (StringUtils.isEmpty(req.getDescription())) {
             // descriptions is recommended for localization.Facilitate fuzzy query
-            String descFormat = Symbols.LEFT_BRACKET.getLocalizedMessage() + "%s"
-                    + Symbols.RIGHT_BRACKET.getLocalizedMessage() + "%s.%s";
+            String descFormat = Symbols.LEFT_BRACKET.i18nKey() + "%s"
+                    + Symbols.RIGHT_BRACKET.i18nKey() + "%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(i18nOutputSerializer.convertString(description, null));
             } else {
-                req.setDescription(String.format(descFormat,
-                        localEnvName(req.getEnvironmentName(), locale), req.getConnectionName(),
-                        req.getDatabaseName()));
+                req.setDescription(i18nOutputSerializer.convertString(String.format(descFormat,
+                        req.getEnvironmentName(), req.getConnectionName(),
+                        req.getDatabaseName()), null));
             }
         }
     }
-
-    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);
-    }
-
 }