diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationController.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationController.java index 0cac4fe1..6acfac52 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationController.java +++ b/adapter/api/src/main/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 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 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 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 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 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> listPaginationResult diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionController.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionController.java index b9be923a..247c78e2 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionController.java +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionController.java @@ -41,6 +41,7 @@ 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; @@ -48,6 +49,7 @@ 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 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 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 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 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 connectionDTOS = connectionService.getConnection(accountAPI.getResourceOwnerAccountId(ctx), getConnectionRequest.getConnectionName()); List connectionResponses = Lists.newArrayList(); @@ -162,7 +163,7 @@ public Mono selectOneConnection(@RequestBody GetConnectio final Set> validate = validator.validate(getConnectionRequest); List 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 connectionDTOS = connectionService.getConnection(accountAPI.getResourceOwnerAccountId(ctx), getConnectionRequest.getConnectionName()); List connectionResponses = Lists.newArrayList(); @@ -188,7 +189,7 @@ public Mono 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> listPaginationResult = connectionService.listConnections( diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationRequest.java index a0689e0c..b8a96087 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationRequest.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationResponse.java index 859b2c0d..439002ce 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/CreateApiDestinationResponse.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationResponse.java index 58703b50..e43b8287 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationResponse.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationResponse.java index fc1f59ac..7febaec3 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationResponse.java +++ b/adapter/api/src/main/java/org/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsRequest.java index cfb1555d..f9e6337b 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsRequest.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsResponse.java index 9a512991..1b036bfb 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/ListApiDestinationsResponse.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationRequest.java index 84304953..841d2629 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationRequest.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationResponse.java index cad0b025..1a9cc64f 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationResponse.java +++ b/adapter/api/src/main/java/org/apache/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionRequest.java index fe6b3257..b1140efd 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionRequest.java +++ b/adapter/api/src/main/java/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionResponse.java index d3ab455e..4b38358b 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/CreateConnectionResponse.java +++ b/adapter/api/src/main/java/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/DeleteConnectionResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/DeleteConnectionResponse.java index 39911992..4b6d3081 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/DeleteConnectionResponse.java +++ b/adapter/api/src/main/java/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/GetConnectionResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/GetConnectionResponse.java index 1cd5a49e..543e528f 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/GetConnectionResponse.java +++ b/adapter/api/src/main/java/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionRequest.java index d935a228..0b784a2a 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionRequest.java +++ b/adapter/api/src/main/java/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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionResponse.java index f624f6f9..0fcb25ca 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListConnectionResponse.java +++ b/adapter/api/src/main/java/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; - } } diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionRequest.java index 2173dc4e..e3fcf478 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionRequest.java +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionRequest.java @@ -34,7 +34,7 @@ @ToString public class UpdateConnectionRequest 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/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionResponse.java index bc527090..ea14c314 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionResponse.java +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/UpdateConnectionResponse.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 UpdateConnectionResponse success() { setMessage(EventBridgeErrorCode.Success.getMsg()); return this; } - - public UpdateConnectionResponse parameterCheckFailRes(String errorMsg) { - setCode(RequestParameterInvalid.getCode()); - setMessage(errorMsg); - return this; - } } diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/exception/EventBridgeErrorCode.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/exception/EventBridgeErrorCode.java index 78ccb8af..8b80d27d 100644 --- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/exception/EventBridgeErrorCode.java +++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/exception/EventBridgeErrorCode.java @@ -88,17 +88,17 @@ public enum EventBridgeErrorCode implements BaseErrorCode { EventRuleAlreadyExist(409, "EventRuleAlreadyExist", "The event rule [{0}] of event bus [{1}] already existed!"), //Connection - ConnectionBoundApiDestination(409, "ConnectionBoundApiDestination", "The Connection [{0}] has bound API Destination, deletion is not allowed."), + ConnectionBoundApiDestination(409, "ConnectionBoundApiDestination", "The Connection [{0}] has bound API Destination,deletion is not allowed."), ConnectionAlreadyExist(409, "ConnectionAlreadyExist", "The Connection [{0}] already existed!"), ConnectionNameInvalid(409, "ConnectionNameInvalid", "The Connection name [{0}] is invalid! Which should match the pattern [{1}]."), - ConnectionCountExceedLimit(409, "ConnectionCountExceedLimit", "The current count of Connection is [{0}], which will exceed the limit quota [{1}]."), + ConnectionCountExceedLimit(409, "ConnectionCountExceedLimit", "The current count of Connection is [{0}],which will exceed the limit quota [{1}]."), ConnectionAuthParametersInvalid(409, "ConnectionAuthParametersInvalid", "The auth parameters of Connection is invalid! Please see the documentation for details."), ConnectionNetworkParametersInvalid(409, "ConnectionNetworkParametersInvalid", "The network parameters of Connection is invalid! Please see the documentation for details."), ConnectionNotExist(409, "ConnectionNotExist", "The Connection [{0}] not existed!"), - LimitSizeInvalid(409, "LimitSizeInvalid", "The limit size of page is invalid, which must greater than 0 and less than [{0}]."), + LimitSizeInvalid(409, "LimitSizeInvalid", "The limit size of page is invalid,which must greater than 0 and less than [{0}]."), NextTokenInvalid(409, "NextTokenInvalid", "The next token of page is invalid. which should be {[0]}."), OauthHttpParametersEmpty(409, "OauthHttpParametersEmpty", "OauthHttpParameters is Empty."), - BasicRequiredParameterIsEmpty(409, "BasicRequiredParameterIsEmpty", "Basic required parameters are empty, the required parameters are username and password!"), + BasicRequiredParameterIsEmpty(409, "BasicRequiredParameterIsEmpty", "Basic required parameters are empty,the required parameters are username and password!"), BasicUserNameLengthExceed(409, "BasicUserNameLengthExceed", "Basic username length cannot exceed 127!"), @@ -107,12 +107,12 @@ public enum EventBridgeErrorCode implements BaseErrorCode { ApiKeyNameLengthExceed(409, "ApiKeyNameLengthExceed", "Api key name length cannot exceed 127!"), ApiKeyValueLengthExceed(409, "ApiKeyValueLengthExceed", "Api key value length cannot exceed 127!"), - ApiKeyRequiredParameterIsEmpty(409, "ApiKeyRequiredParameterIsEmpty", "Api Key required parameters are empty, the required parameters are apiKeyName and apiKeyValue!"), - OAuthRequiredParameterIsEmpty(409, "OAuthRequiredParameterIsEmpty", "OAuth required parameters are empty, the required parameters are authorizationEndpoint and httpMethod!"), + ApiKeyRequiredParameterIsEmpty(409, "ApiKeyRequiredParameterIsEmpty", "Api Key required parameters are empty,the required parameters are apiKeyName and apiKeyValue!"), + OAuthRequiredParameterIsEmpty(409, "OAuthRequiredParameterIsEmpty", "OAuth required parameters are empty,the required parameters are authorizationEndpoint and httpMethod!"), //API Destination ApiDestinationNameInvalid(409, "ApiDestinationNameInvalid", "The api-destination name [{0}] is invalid! Which should match the pattern [{1}]."), - ApiDestinationCountExceedLimit(409, "ApiDestinationCountExceedLimit", "The current count of api-destination is [{0}], which will exceed the limit quota [{1}]."), + ApiDestinationCountExceedLimit(409, "ApiDestinationCountExceedLimit", "The current count of api-destination is [{0}],which will exceed the limit quota [{1}]."), ApiDestinationAlreadyExist(409, "ApiDestinationAlreadyExist", "The api-destination [{0}] already existed!"), ApiDestinationParametersInvalid(409, "ApiDestinationParametersInvalid", "The api-destination parameters [{0}] is invalid! Please see the documentation for details."), ApiDestinationNotExist(409, "ApiDestinationNotExist", "The api-destination [{0}] not existed!"), @@ -134,7 +134,7 @@ public enum EventBridgeErrorCode implements BaseErrorCode { ClientSecretLengthExceed(409, "ClientSecretLengthExceed", "ClientSecret length cannot exceed 127!"), AuthorizationEndpointLengthExceed(409, "AuthorizationEndpointLengthExceed", "Authorization endpoint length cannot exceed 127!"), NetworkParametersIsEmpty(409, "NetworkParametersIsEmpty", "Network required parameter is empty!"), - RequestParameterInvalid(409, "RequestParameterInvalid", "Request parameter Invalid!"); + RequestParameterInvalid(409, "RequestParameterInvalid", "[{0}]"); private final int httpCode; private final String code;