fix(apply-project): project role names are not internationalized

server/odc-core/src/main/java/com/oceanbase/odc/core/authority/permission/ResourceRoleBasedPermission.java

@@ -43,8 +43,8 @@ public class ResourceRoleBasedPermission implements Permission {
     public ResourceRoleBasedPermission(@NonNull SecurityResource resource, @NonNull String resourceRole) {
         this.resourceId = resource.resourceId();
         this.resourceType = resource.resourceType();
-        this.resourceRoles = Arrays.stream(StringUtils.split(resourceRole, ",")).map(ResourceRoleName::fromValue)
-                .collect(Collectors.toList());
+        this.resourceRoles = Arrays.stream(StringUtils.split(resourceRole, ","))
+                .map(e -> ResourceRoleName.valueOf(e.trim().toUpperCase())).collect(Collectors.toList());
         Validate.notNull(resourceId, "ResourceId can not be null");
         Validate.notNull(resourceType, "ResourceType can not be null");
     }

server/odc-core/src/main/java/com/oceanbase/odc/core/shared/constant/ResourceRoleName.java

@@ -17,45 +17,36 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.oceanbase.odc.common.util.StringUtils;
+import org.springframework.context.i18n.LocaleContextHolder;
 
-public enum ResourceRoleName {
-    OWNER("OWNER"),
+import com.oceanbase.odc.common.i18n.Translatable;
 
-    DBA("DBA"),
+public enum ResourceRoleName implements Translatable {
 
-    DEVELOPER("DEVELOPER"),
+    OWNER,
 
-    SECURITY_ADMINISTRATOR("SECURITY_ADMINISTRATOR"),
+    DBA,
 
-    PARTICIPANT("PARTICIPANT");
+    DEVELOPER,
 
-    private String value;
+    SECURITY_ADMINISTRATOR,
 
-    ResourceRoleName(String value) {
-        this.value = value;
-    }
+    PARTICIPANT;
 
     public static List<ResourceRoleName> all() {
         return Arrays.asList(ResourceRoleName.values());
     }
 
-    @JsonValue
-    public String getValue() {
-        return this.value;
+    @Override
+    public String code() {
+        return name();
     }
 
-    @JsonCreator
-    public static ResourceRoleName fromValue(String value) {
-        for (ResourceRoleName resourceRole : ResourceRoleName.values()) {
-            if (StringUtils.equalsIgnoreCase(resourceRole.getValue(), StringUtils.trim(value))) {
-                return resourceRole;
-            }
-        }
-        throw new IllegalArgumentException("ResourceRoleName value not supported, given value '" + value + "'");
+    public String getLocalizedMessage() {
+        Locale locale = LocaleContextHolder.getLocale();
+        return translate(null, locale);
     }
 
 }

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

@@ -735,4 +735,13 @@ com.oceanbase.odc.TaskType.APPLY_PROJECT_PERMISSION= Apply Project Permission
 #
 # Permission Apply
 #
-com.oceanbase.odc.builtin-resource.permission-apply.project.description=Requesting {1} permissions for project {0}
+com.oceanbase.odc.builtin-resource.permission-apply.project.description=Requesting [{1}] permissions for project [{0}]
+
+#
+# ResourceRoleName
+#
+com.oceanbase.odc.ResourceRoleName.OWNER=Administrator
+com.oceanbase.odc.ResourceRoleName.DBA=DBA
+com.oceanbase.odc.ResourceRoleName.DEVELOPER=Ordinary Member
+com.oceanbase.odc.ResourceRoleName.SECURITY_ADMINISTRATOR=Security Administrator
+com.oceanbase.odc.ResourceRoleName.PARTICIPANT=Participant

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

@@ -666,4 +666,13 @@ com.oceanbase.odc.TaskType.APPLY_PROJECT_PERMISSION=申请项目权限
 #
 # Permission Apply
 #
-com.oceanbase.odc.builtin-resource.permission-apply.project.description=申请项目{0}的{1}权限
+com.oceanbase.odc.builtin-resource.permission-apply.project.description=申请项目【{0}】的【{1}】权限
+
+#
+# ResourceRoleName
+#
+com.oceanbase.odc.ResourceRoleName.OWNER=管理员
+com.oceanbase.odc.ResourceRoleName.DBA=DBA
+com.oceanbase.odc.ResourceRoleName.DEVELOPER=普通成员
+com.oceanbase.odc.ResourceRoleName.SECURITY_ADMINISTRATOR=安全管理员
+com.oceanbase.odc.ResourceRoleName.PARTICIPANT=参与者

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

@@ -739,4 +739,13 @@ com.oceanbase.odc.TaskType.APPLY_PROJECT_PERMISSION=申請項目權限
 #
 # Permission Apply
 #
-com.oceanbase.odc.builtin-resource.permission-apply.project.description=申請項目{0}的{1}權限
+com.oceanbase.odc.builtin-resource.permission-apply.project.description=申請項目【{0}】的【{1}】權限
+
+#
+# ResourceRoleName
+#
+com.oceanbase.odc.ResourceRoleName.OWNER=管理員
+com.oceanbase.odc.ResourceRoleName.DBA=DBA
+com.oceanbase.odc.ResourceRoleName.DEVELOPER=普通成員
+com.oceanbase.odc.ResourceRoleName.SECURITY_ADMINISTRATOR=安全管理員
+com.oceanbase.odc.ResourceRoleName.PARTICIPANT=參與者

server/odc-service/src/main/java/com/oceanbase/odc/service/permissionapply/project/ApplyProjectPreprocessor.java

@@ -74,8 +74,11 @@ public void process(CreateFlowInstanceReq req) {
         req.setProjectName(projectEntity.getName());
         Locale locale = LocaleContextHolder.getLocale();
         String i18nKey = "com.oceanbase.odc.builtin-resource.permission-apply.project.description";
-        req.setDescription(I18n.translate(i18nKey, new Object[] {projectEntity.getName(),
-                resourceRoleEntities.stream().map(r -> r.getRoleName().name()).collect(Collectors.joining(","))},
+        req.setDescription(I18n.translate(
+                i18nKey,
+                new Object[] {projectEntity.getName(),
+                        resourceRoleEntities.stream().map(r -> r.getRoleName().getLocalizedMessage())
+                                .collect(Collectors.joining(","))},
                 locale));
     }