apache · zhaohai666 · Mar 1, 2024 · Mar 1, 2024
diff --git a/...java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationController.java b/...java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationController.java
@@ -36,11 +36,13 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.ListApiDestinationsResponse;
 import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.UpdateApiDestinationRequest;
 import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.UpdateApiDestinationResponse;
+import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 import org.apache.rocketmq.eventbridge.domain.model.PaginationResult;
 import org.apache.rocketmq.eventbridge.domain.model.apidestination.ApiDestinationDTO;
 import org.apache.rocketmq.eventbridge.domain.model.apidestination.ApiDestinationService;
 import org.apache.rocketmq.eventbridge.domain.model.apidestination.parameter.HttpApiParameters;
 import org.apache.rocketmq.eventbridge.domain.rpc.AccountAPI;
+import org.apache.rocketmq.eventbridge.exception.EventBridgeException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -73,7 +75,7 @@ public Mono<CreateApiDestinationResponse> createApiDestination(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new CreateApiDestinationResponse(null).parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 ApiDestinationDTO apiDestinationDTO = getEventApiDestination(
                     createApiDestinationRequest.getHttpApiParameters(), createApiDestinationRequest.getDescription(),
@@ -97,7 +99,7 @@ public Mono<UpdateApiDestinationResponse> updateApiDestination(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new UpdateApiDestinationResponse().parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 ApiDestinationDTO apiDestinationDTO = getEventApiDestination(
                     updateApiDestinationRequest.getHttpApiParameters(), updateApiDestinationRequest.getDescription(),
@@ -121,8 +123,7 @@ public Mono<GetApiDestinationResponse> getApiDestination(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new GetApiDestinationResponse(null, null, null, null, null, null).parameterCheckFailRes(
-                        errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 final ApiDestinationDTO apiDestinationDTO = apiDestinationService.getApiDestination(
                     accountAPI.getResourceOwnerAccountId(ctx), getApiDestinationRequest.getApiDestinationName());
@@ -145,7 +146,7 @@ public Mono<DeleteApiDestinationResponse> deleteApiDestination(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new DeleteApiDestinationResponse().parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 apiDestinationService.deleteApiDestination(accountAPI.getResourceOwnerAccountId(ctx),
                     deleteApiDestinationRequest.getApiDestinationName());
@@ -165,8 +166,7 @@ public Mono<ListApiDestinationsResponse> listApiDestinations(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new ListApiDestinationsResponse(null, null, null, 0).parameterCheckFailRes(
-                        errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 listApiDestinationsRequest.checkMaxResultsAndNextToken();
                 final PaginationResult<List<ApiDestinationDTO>> listPaginationResult

diff --git a/...ain/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionController.java b/...ain/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionController.java
@@ -41,13 +41,15 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.UpdateConnectionResponse;
 import org.apache.rocketmq.eventbridge.domain.common.enums.AuthorizationTypeEnum;
 import org.apache.rocketmq.eventbridge.domain.common.enums.NetworkTypeEnum;
+import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 import org.apache.rocketmq.eventbridge.domain.model.PaginationResult;
 import org.apache.rocketmq.eventbridge.domain.model.connection.ConnectionDTO;
 import org.apache.rocketmq.eventbridge.domain.model.connection.ConnectionService;
 import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.ApiKeyAuthParameters;
 import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.BasicAuthParameters;
 import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.OAuthParameters;
 import org.apache.rocketmq.eventbridge.domain.rpc.AccountAPI;
+import org.apache.rocketmq.eventbridge.exception.EventBridgeException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -80,7 +82,7 @@ public Mono<CreateConnectionResponse> createConnection(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new CreateConnectionResponse(null).parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 ConnectionDTO connectionDTO = getEventConnectionWithBLOBs(ctx, createConnectionRequest);
                 return new CreateConnectionResponse(connectionService.createConnection(connectionDTO)).success();
@@ -99,7 +101,7 @@ public Mono<DeleteConnectionResponse> deleteConnection(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new DeleteConnectionResponse().parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 connectionService.deleteConnection(accountAPI.getResourceOwnerAccountId(ctx),
                     deleteConnectionRequest.getConnectionName());
@@ -119,7 +121,7 @@ public Mono<UpdateConnectionResponse> updateConnection(
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new UpdateConnectionResponse().parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 ConnectionDTO connectionDTO = getEventConnectionWithBLOBs(ctx, updateConnectionRequest);
                 connectionService.updateConnection(connectionDTO, accountAPI.getResourceOwnerAccountId(ctx));
@@ -138,8 +140,7 @@ public Mono<GetConnectionResponse> getConnection(@RequestBody GetConnectionReque
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new GetConnectionResponse(null).parameterCheckFailRes(
-                        errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 final List<ConnectionDTO> connectionDTOS = connectionService.getConnection(accountAPI.getResourceOwnerAccountId(ctx), getConnectionRequest.getConnectionName());
                 List<ConnectionResponse> connectionResponses = Lists.newArrayList();
@@ -162,7 +163,7 @@ public Mono<GetConnectionResponse> selectOneConnection(@RequestBody GetConnectio
                 final Set<ConstraintViolation<GetConnectionRequest>> validate = validator.validate(getConnectionRequest);
                 List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new GetConnectionResponse(null).parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 final List<ConnectionDTO> connectionDTOS = connectionService.getConnection(accountAPI.getResourceOwnerAccountId(ctx), getConnectionRequest.getConnectionName());
                 List<ConnectionResponse> connectionResponses = Lists.newArrayList();
@@ -188,7 +189,7 @@ public Mono<ListConnectionResponse> listConnections(@RequestBody ListConnectionR
                     .map(ConstraintViolation::getMessage)
                     .collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(errMessage)) {
-                    return new ListConnectionResponse(null, null, null, 0).parameterCheckFailRes(errMessage.toString());
+                    throw new EventBridgeException(EventBridgeErrorCode.RequestParameterInvalid, errMessage.toString());
                 }
                 listConnectionRequest.checkMaxResultsAndNextToken();
                 final PaginationResult<List<ConnectionDTO>> listPaginationResult = connectionService.listConnections(

diff --git a/...ache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationRequest.java b/...ache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationRequest.java
@@ -32,14 +32,14 @@
 @ToString
 public class CreateApiDestinationRequest extends BaseResponse {
 
-    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The ApiDestination name is invalid! Only letters a~z or A~Z, numbers 0~9, underscore (_) and dash (-) are supported.")
+    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The ApiDestination name is invalid! Only letters a~z or A~Z，numbers 0~9，underscore (_) and dash (-) are supported.")
     @Length(min = 2, max = 127, message = "The ApiDestination name length cannot exceed 127.")
     @NotBlank(message = "ApiDestinationName is blank")
     @SerializedName("ApiDestinationName")
     private String apiDestinationName;
 
     @SerializedName("ConnectionName")
-    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The Connection name is invalid! Only letters a~z or A~Z, numbers 0~9, underscore (_) and dash (-) are supported.")
+    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The Connection name is invalid! Only letters a~z or A~Z，numbers 0~9，underscore (_) and dash (-) are supported.")
     @Length(min = 2, max = 127, message = "The connection name length cannot exceed 127.")
     @NotBlank(message = "ConnectionName is blank.")
     private String connectionName;

diff --git a/...che/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationResponse.java b/...che/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationResponse.java
@@ -24,7 +24,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -39,10 +38,4 @@ public CreateApiDestinationResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public CreateApiDestinationResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...che/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationResponse.java b/...che/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationResponse.java
@@ -24,7 +24,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -37,10 +36,4 @@ public DeleteApiDestinationResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public DeleteApiDestinationResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationResponse.java b/...apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationResponse.java
@@ -26,7 +26,6 @@
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 import org.apache.rocketmq.eventbridge.domain.model.apidestination.parameter.HttpApiParameters;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -57,10 +56,4 @@ public GetApiDestinationResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public GetApiDestinationResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...pache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsRequest.java b/...pache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsRequest.java
@@ -37,7 +37,7 @@ public class ListApiDestinationsRequest extends BaseResponse {
     private String connectionName;
 
 
-    @Min(value = 0, message = "The limit size of page is invalid, which must greater than 0 and less than [{0}].")
+    @Min(value = 0, message = "The limit size of page is invalid，which must greater than 0 and less than [{0}].")
     @SerializedName("MaxResults")
     private Integer maxResults;
 

diff --git a/...ache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsResponse.java b/...ache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsResponse.java
@@ -26,7 +26,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -51,10 +50,4 @@ public ListApiDestinationsResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public ListApiDestinationsResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...ache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationRequest.java b/...ache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationRequest.java
@@ -33,7 +33,7 @@
 @ToString
 public class UpdateApiDestinationRequest extends BaseResponse {
 
-    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The ApiDestination name is invalid! Only letters a~z or A~Z, numbers 0~9, underscore (_) and dash (-) are supported.")
+    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The ApiDestination name is invalid! Only letters a~z or A~Z，numbers 0~9，underscore (_) and dash (-) are supported.")
     @Length(min = 2, max = 127, message = "The ApiDestination name length cannot exceed 127.")
     @NotBlank(message = "ApiDestinationName is blank")
     @SerializedName("ApiDestinationName")

diff --git a/...che/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationResponse.java b/...che/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationResponse.java
@@ -24,7 +24,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -37,10 +36,4 @@ public UpdateApiDestinationResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public UpdateApiDestinationResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...a/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionRequest.java b/...a/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionRequest.java
@@ -33,7 +33,7 @@
 @ToString
 public class CreateConnectionRequest extends BaseRequest {
 
-    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The Connection name is invalid! Only letters a~z or A~Z, numbers 0~9, underscore (_) and dash (-) are supported.")
+    @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The Connection name is invalid! Only letters a~z or A~Z，numbers 0~9，underscore (_) and dash (-) are supported.")
     @Length(min = 2, max = 127, message = "The connection name length cannot exceed 127.")
     @NotBlank(message = "ConnectionName is blank.")
     @SerializedName("ConnectionName")

diff --git a/.../org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionResponse.java b/.../org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionResponse.java
@@ -24,7 +24,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -39,10 +38,4 @@ public CreateConnectionResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public CreateConnectionResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/.../org/apache/rocketmq/eventbridge/adapter/api/dto/connection/DeleteConnectionResponse.java b/.../org/apache/rocketmq/eventbridge/adapter/api/dto/connection/DeleteConnectionResponse.java
@@ -24,7 +24,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -37,10 +36,4 @@ public DeleteConnectionResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public DeleteConnectionResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...ava/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/GetConnectionResponse.java b/...ava/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/GetConnectionResponse.java
@@ -26,7 +26,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -42,10 +41,4 @@ public GetConnectionResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public GetConnectionResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }
diff --git a/...ava/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionRequest.java b/...ava/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionRequest.java
@@ -33,7 +33,7 @@ public class ListConnectionRequest extends BaseRequest {
     @SerializedName("ConnectionNamePrefix")
     private String connectionNamePrefix;
 
-    @Min(value = 0, message = "The limit size of page is invalid, which must greater than 0 and less than [{0}].")
+    @Min(value = 0, message = "The limit size of page is invalid，which must greater than 0 and less than [{0}].")
     @SerializedName("MaxResults")
     private Integer maxResults;
 

diff --git a/...va/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionResponse.java b/...va/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionResponse.java
@@ -26,7 +26,6 @@
 import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse;
 import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
 
-import static org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode.RequestParameterInvalid;
 
 @AllArgsConstructor
 @Getter
@@ -51,10 +50,4 @@ public ListConnectionResponse success() {
         setMessage(EventBridgeErrorCode.Success.getMsg());
         return this;
     }
-
-    public ListConnectionResponse parameterCheckFailRes(String errorMsg) {
-        setCode(RequestParameterInvalid.getCode());
-        setMessage(errorMsg);
-        return this;
-    }
 }