This is an automated email from the ASF dual-hosted git repository. shenlin pushed a commit to branch feat/apiDestination in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 916fcf054799cd251c904e648355b00497b004ea Author: zh378814 <[email protected]> AuthorDate: Mon Jun 20 10:36:28 2022 +0800 update response result --- .../api/controller/ApiDestinationController.java | 31 +++++----- .../api/controller/ConnectionController.java | 35 +++++------ .../adapter/api/dto/ResponseResult.java | 69 ++++++++++++++++++++++ .../CreateApiDestinationRequest.java | 4 +- .../CreateApiDestinationResponse.java | 17 +----- .../DeleteApiDestinationRequest.java | 4 +- .../DeleteApiDestinationResponse.java | 17 +----- .../apidestination/GetApiDestinationRequest.java | 4 +- .../apidestination/GetApiDestinationResponse.java | 16 +---- .../apidestination/ListApiDestinationsRequest.java | 4 +- .../ListApiDestinationsResponse.java | 17 +----- .../UpdateApiDestinationRequest.java | 4 +- .../UpdateApiDestinationResponse.java | 17 +----- .../dto/connection/CreateConnectionResponse.java | 16 +---- .../dto/connection/DeleteConnectionResponse.java | 17 +----- .../api/dto/connection/GetConnectionResponse.java | 17 +----- .../api/dto/connection/ListConnectionResponse.java | 17 +----- .../api/dto/connection/ListEnumsResponse.java | 11 +--- .../dto/connection/UpdateConnectionResponse.java | 17 +----- .../ApiDestinationDTOControllerTest.java | 17 +++--- .../api/controller/ConnectionControllerTest.java | 23 ++++---- 21 files changed, 156 insertions(+), 218 deletions(-) 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 a5d32a9..494035f 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 @@ -19,6 +19,7 @@ package org.apache.rocketmq.eventbridge.adapter.api.controller; import com.google.common.collect.Lists; import org.apache.rocketmq.eventbridge.adapter.api.annotations.WebLog; +import org.apache.rocketmq.eventbridge.adapter.api.dto.ResponseResult; import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.ApiDestinationsResponse; import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.CreateApiDestinationRequest; import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.CreateApiDestinationResponse; @@ -62,60 +63,60 @@ public class ApiDestinationController { @WebLog @PostMapping("createApiDestination") - public CreateApiDestinationResponse createApiDestination(@RequestBody CreateApiDestinationRequest createApiDestinationRequest) { + public ResponseResult<CreateApiDestinationResponse> createApiDestination(@RequestBody CreateApiDestinationRequest createApiDestinationRequest) { final Set<ConstraintViolation<CreateApiDestinationRequest>> validate = validator.validate(createApiDestinationRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new CreateApiDestinationResponse(null).parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } ApiDestinationDTO apiDestinationDTO = getEventApiDestination(createApiDestinationRequest.getHttpApiParameters(), createApiDestinationRequest.getDescription(), createApiDestinationRequest.getConnectionName(), createApiDestinationRequest.getInvocationRateLimitPerSecond(), createApiDestinationRequest.getApiDestinationName(), accountAPI); - return new CreateApiDestinationResponse(apiDestinationService.createApiDestination(apiDestinationDTO)).success(); + return ResponseResult.success(new CreateApiDestinationResponse(apiDestinationService.createApiDestination(apiDestinationDTO))); } @WebLog @PostMapping("updateApiDestination") - public UpdateApiDestinationResponse updateApiDestination(@RequestBody UpdateApiDestinationRequest updateApiDestinationRequest) { + public ResponseResult<UpdateApiDestinationResponse> updateApiDestination(@RequestBody UpdateApiDestinationRequest updateApiDestinationRequest) { final Set<ConstraintViolation<UpdateApiDestinationRequest>> validate = validator.validate(updateApiDestinationRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new UpdateApiDestinationResponse().parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } ApiDestinationDTO apiDestinationDTO = getEventApiDestination(updateApiDestinationRequest.getHttpApiParameters(), updateApiDestinationRequest.getDescription(), updateApiDestinationRequest.getConnectionName(), updateApiDestinationRequest.getInvocationRateLimitPerSecond(), updateApiDestinationRequest.getApiDestinationName(), accountAPI); apiDestinationService.updateApiDestination(apiDestinationDTO); - return new UpdateApiDestinationResponse().success(); + return ResponseResult.success(); } @WebLog @PostMapping("getApiDestination") - public GetApiDestinationResponse getApiDestination(@RequestBody GetApiDestinationRequest getApiDestinationRequest) { + public ResponseResult<GetApiDestinationResponse> getApiDestination(@RequestBody GetApiDestinationRequest getApiDestinationRequest) { final Set<ConstraintViolation<GetApiDestinationRequest>> validate = validator.validate(getApiDestinationRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new GetApiDestinationResponse(null, null, null, null, null).parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } final ApiDestinationDTO apiDestinationDTO = apiDestinationService.getApiDestination(accountAPI.getResourceOwnerAccountId(), getApiDestinationRequest.getApiDestinationName()); - return new GetApiDestinationResponse(apiDestinationDTO.getName(), apiDestinationDTO.getConnectionName(), apiDestinationDTO.getDescription(), apiDestinationDTO.getApiParams(), apiDestinationDTO.getInvocationRateLimitPerSecond()).success(); + return ResponseResult.success(new GetApiDestinationResponse(apiDestinationDTO.getName(), apiDestinationDTO.getConnectionName(), apiDestinationDTO.getDescription(), apiDestinationDTO.getApiParams(), apiDestinationDTO.getInvocationRateLimitPerSecond())); } @WebLog @PostMapping("deleteApiDestination") - public DeleteApiDestinationResponse deleteApiDestination(@RequestBody DeleteApiDestinationRequest deleteApiDestinationRequest) { + public ResponseResult<DeleteApiDestinationResponse> deleteApiDestination(@RequestBody DeleteApiDestinationRequest deleteApiDestinationRequest) { final Set<ConstraintViolation<DeleteApiDestinationRequest>> validate = validator.validate(deleteApiDestinationRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new DeleteApiDestinationResponse().parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } apiDestinationService.deleteApiDestination(accountAPI.getResourceOwnerAccountId(), deleteApiDestinationRequest.getApiDestinationName()); - return new DeleteApiDestinationResponse().success(); + return ResponseResult.success(); } @WebLog @PostMapping("listApiDestinations") - public ListApiDestinationsResponse listApiDestinations(@RequestBody ListApiDestinationsRequest listApiDestinationsRequest) { + public ResponseResult<ListApiDestinationsResponse> listApiDestinations(@RequestBody ListApiDestinationsRequest listApiDestinationsRequest) { final Set<ConstraintViolation<ListApiDestinationsRequest>> validate = validator.validate(listApiDestinationsRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new ListApiDestinationsResponse(null, null, null, 0).parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } final PaginationResult<List<ApiDestinationDTO>> listPaginationResult = apiDestinationService.listApiDestinations(accountAPI.getResourceOwnerAccountId(), listApiDestinationsRequest.getApiDestinationNamePrefix(), listApiDestinationsRequest.getNextToken(), listApiDestinationsRequest.getMaxResults()); @@ -128,7 +129,7 @@ public class ApiDestinationController { apiDestinationsResponse.setHttpApiParameters(eventApiDestination.getApiParams()); apiDestinationsResponses.add(apiDestinationsResponse); }); - return new ListApiDestinationsResponse(apiDestinationsResponses, listPaginationResult.getNextToken(), listPaginationResult.getTotal(), listApiDestinationsRequest.getMaxResults()).success(); + return ResponseResult.success(new ListApiDestinationsResponse(apiDestinationsResponses, listPaginationResult.getNextToken(), listPaginationResult.getTotal(), listApiDestinationsRequest.getMaxResults())); } private ApiDestinationDTO getEventApiDestination(HttpApiParameters apiParams, String description, String connectionName, Integer invocationRateLimitPerSecond, String name, AccountAPI accountAPI) { 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 357b2df..df5f0e3 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 @@ -20,6 +20,7 @@ package org.apache.rocketmq.eventbridge.adapter.api.controller; import com.google.common.collect.Lists; import org.apache.rocketmq.eventbridge.adapter.api.annotations.WebLog; import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseRequest; +import org.apache.rocketmq.eventbridge.adapter.api.dto.ResponseResult; import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.ConnectionResponse; import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.CreateConnectionRequest; import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.CreateConnectionResponse; @@ -66,60 +67,60 @@ public class ConnectionController { @WebLog @PostMapping("createConnection") - public CreateConnectionResponse createConnection(@RequestBody CreateConnectionRequest createConnectionRequest) { + public ResponseResult<CreateConnectionResponse> createConnection(@RequestBody CreateConnectionRequest createConnectionRequest) { final Set<ConstraintViolation<CreateConnectionRequest>> validate = validator.validate(createConnectionRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new CreateConnectionResponse(null).parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } ConnectionDTO connectionDTO = getEventConnectionWithBLOBs(createConnectionRequest); - return new CreateConnectionResponse(connectionService.createConnection(connectionDTO)).success(); + return ResponseResult.success(new CreateConnectionResponse(connectionService.createConnection(connectionDTO))); } @WebLog @PostMapping("deleteConnection") - public DeleteConnectionResponse deleteConnection(@RequestBody DeleteConnectionRequest deleteConnectionRequest) { + public ResponseResult<DeleteConnectionResponse> deleteConnection(@RequestBody DeleteConnectionRequest deleteConnectionRequest) { final Set<ConstraintViolation<DeleteConnectionRequest>> validate = validator.validate(deleteConnectionRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new DeleteConnectionResponse().parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } connectionService.deleteConnection(accountAPI.getResourceOwnerAccountId(), deleteConnectionRequest.getConnectionName()); - return new DeleteConnectionResponse().success(); + return ResponseResult.success(); } @WebLog @PostMapping("updateConnection") - public UpdateConnectionResponse updateConnection(@RequestBody UpdateConnectionRequest updateConnectionRequest) { + public ResponseResult<UpdateConnectionResponse> updateConnection(@RequestBody UpdateConnectionRequest updateConnectionRequest) { final Set<ConstraintViolation<UpdateConnectionRequest>> validate = validator.validate(updateConnectionRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new UpdateConnectionResponse().parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } ConnectionDTO connectionDTO = getEventConnectionWithBLOBs(updateConnectionRequest); connectionService.updateConnection(connectionDTO, accountAPI.getResourceOwnerAccountId()); - return new UpdateConnectionResponse().success(); + return ResponseResult.success(); } @WebLog @PostMapping("getConnection") - public GetConnectionResponse getConnection(@RequestBody GetConnectionRequest getConnectionRequest) { + public ResponseResult<GetConnectionResponse> getConnection(@RequestBody GetConnectionRequest getConnectionRequest) { 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, null, null, null).parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } final ConnectionDTO connectionDTO = connectionService.getConnection(accountAPI.getResourceOwnerAccountId(), getConnectionRequest.getConnectionName()); - return new GetConnectionResponse(connectionDTO.getConnectionName(), connectionDTO.getDescription(), connectionDTO.getNetworkParameters(), connectionDTO.getAuthParameters()).success(); + return ResponseResult.success(new GetConnectionResponse(connectionDTO.getConnectionName(), connectionDTO.getDescription(), connectionDTO.getNetworkParameters(), connectionDTO.getAuthParameters())); } @WebLog @PostMapping("listConnections") - public ListConnectionResponse listConnections(@RequestBody ListConnectionRequest listConnectionRequest) { + public ResponseResult<ListConnectionResponse> listConnections(@RequestBody ListConnectionRequest listConnectionRequest) { final Set<ConstraintViolation<ListConnectionRequest>> validate = validator.validate(listConnectionRequest); List<String> errMessage = validate.stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errMessage)) { - return new ListConnectionResponse(null, null, null, 0).parameterCheckFailRes(errMessage.toString()); + return ResponseResult.fail(errMessage.toString()); } final PaginationResult<List<ConnectionDTO>> listPaginationResult = connectionService.listConnections(accountAPI.getResourceOwnerAccountId(), listConnectionRequest.getConnectionNamePrefix(), listConnectionRequest.getNextToken(), listConnectionRequest.getMaxResults()); @@ -130,15 +131,15 @@ public class ConnectionController { BeanUtils.copyProperties(connectionDTO, connectionResponse); connectionResponses.add(connectionResponse); }); - return new ListConnectionResponse(connectionResponses, listPaginationResult.getNextToken(), listPaginationResult.getTotal(), listConnectionRequest.getMaxResults()).success(); + return ResponseResult.success(new ListConnectionResponse(connectionResponses, listPaginationResult.getNextToken(), listPaginationResult.getTotal(), listConnectionRequest.getMaxResults())); } @PostMapping("listEnumsResponse") - public ListEnumsResponse listEnumsResponse() { + public ResponseResult<ListEnumsResponse> listEnumsResponse() { ListEnumsResponse listEnumsResponse = new ListEnumsResponse(); listEnumsResponse.setAuthorizationTypeEnums(Arrays.stream(AuthorizationTypeEnum.values()).collect(Collectors.toList())); listEnumsResponse.setNetworkTypeEnums(Arrays.stream(NetworkTypeEnum.values()).collect(Collectors.toList())); - return listEnumsResponse.success(); + return ResponseResult.success(listEnumsResponse); } private ConnectionDTO getEventConnectionWithBLOBs(BaseRequest baseRequest) { diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/ResponseResult.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/ResponseResult.java new file mode 100644 index 0000000..1697bb3 --- /dev/null +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/ResponseResult.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.eventbridge.adapter.api.dto; + +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; + +import java.io.Serializable; +import java.util.UUID; + +@EqualsAndHashCode(callSuper = true) +@Data +@Builder +public class ResponseResult<T> extends BaseDTO { + + public String requestId; + private String code; + private String message; + private String success; + private T data; + + public static <T> ResponseResult<T> success() { + return success(null); + } + + public static <T> ResponseResult<T> success(T data) { + return ResponseResult.<T>builder() + .message(EventBridgeErrorCode.Success.getMsg()) + .code(EventBridgeErrorCode.Success.getCode()) + .success(Boolean.TRUE.toString()) + .data(data) + .requestId(UUID.randomUUID() + .toString()) + .build(); + } + + public static <T extends Serializable> ResponseResult<T> fail(String message) { + return fail(null, message); + } + + public static <T> ResponseResult<T> fail(T data, String message) { + return ResponseResult.<T>builder().data(data) + .message(message) + .code(Integer.toString(409)) + .success(Boolean.FALSE.toString()) + .message(message) + .data(data) + .requestId(UUID.randomUUID() + .toString()) + .build(); + } +} 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 e19537e..41f7c12 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 @@ -21,7 +21,7 @@ import com.google.gson.annotations.SerializedName; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseRequest; import org.apache.rocketmq.eventbridge.domain.model.apidestination.parameter.HttpApiParameters; import org.hibernate.validator.constraints.Length; @@ -32,7 +32,7 @@ import javax.validation.constraints.Pattern; @Getter @Setter @ToString -public class CreateApiDestinationRequest extends BaseResponse { +public class CreateApiDestinationRequest extends BaseRequest { @Pattern(regexp = "^[A-Za-z|0-9][A-Za-z|0-9|_|-]+$", message = "The ApiDestination name is invalid! Which should match the pattern.") @Length(min = 1, max = 127, message = "The ApiDestination name Exceeded length.") 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 24d8539..57ba939 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 @@ -21,27 +21,14 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.ListConnectionResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; @AllArgsConstructor @Getter @Setter @ToString -public class CreateApiDestinationResponse extends BaseResponse { +public class CreateApiDestinationResponse extends BaseDTO { private String apiDestinationName; - public CreateApiDestinationResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public CreateApiDestinationResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } } diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationRequest.java index 05d28d9..14baf52 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationRequest.java +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/DeleteApiDestinationRequest.java @@ -21,14 +21,14 @@ import com.google.gson.annotations.SerializedName; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseRequest; import javax.validation.constraints.NotBlank; @Getter @Setter @ToString -public class DeleteApiDestinationRequest extends BaseResponse { +public class DeleteApiDestinationRequest extends BaseRequest { @NotBlank(message = "ApiDestinationName is blank") @SerializedName("ApiDestinationName") 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 991096f..139964f 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 @@ -21,24 +21,11 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; @AllArgsConstructor @Getter @Setter @ToString -public class DeleteApiDestinationResponse extends BaseResponse { - - public DeleteApiDestinationResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public DeleteApiDestinationResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } +public class DeleteApiDestinationResponse extends BaseDTO { } diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationRequest.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationRequest.java index c82e4e5..22f677c 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationRequest.java +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/GetApiDestinationRequest.java @@ -21,14 +21,14 @@ import com.google.gson.annotations.SerializedName; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseRequest; import javax.validation.constraints.NotBlank; @Getter @Setter @ToString -public class GetApiDestinationRequest extends BaseResponse { +public class GetApiDestinationRequest extends BaseRequest { @NotBlank(message = "ApiDestinationName is blank") @SerializedName("ApiDestinationName") 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 0753e28..c24ebd1 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 @@ -22,15 +22,14 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; import org.apache.rocketmq.eventbridge.domain.model.apidestination.parameter.HttpApiParameters; @AllArgsConstructor @Getter @Setter @ToString -public class GetApiDestinationResponse extends BaseResponse { +public class GetApiDestinationResponse extends BaseDTO { @SerializedName("ApiDestinationName") private String apiDestinationName; @@ -47,15 +46,4 @@ public class GetApiDestinationResponse extends BaseResponse { @SerializedName("InvocationRateLimitPerSecond") private Integer invocationRateLimitPerSecond; - public GetApiDestinationResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public GetApiDestinationResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - 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 d8fa947..5fd6b96 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 @@ -21,7 +21,7 @@ import com.google.gson.annotations.SerializedName; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseRequest; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; @@ -29,7 +29,7 @@ import javax.validation.constraints.NotBlank; @Getter @Setter @ToString -public class ListApiDestinationsRequest extends BaseResponse { +public class ListApiDestinationsRequest extends BaseRequest { @SerializedName("ApiDestinationNamePrefix") private String apiDestinationNamePrefix; 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 05e72aa..3fb4fe0 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 @@ -22,8 +22,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; import java.util.List; @@ -31,7 +30,7 @@ import java.util.List; @Getter @Setter @ToString -public class ListApiDestinationsResponse extends BaseResponse { +public class ListApiDestinationsResponse extends BaseDTO { @SerializedName("ApiDestinations") private List<ApiDestinationsResponse> apiDestinations; @@ -44,16 +43,4 @@ public class ListApiDestinationsResponse extends BaseResponse { @SerializedName("MaxResults") private int maxResults; - - public ListApiDestinationsResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public ListApiDestinationsResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - 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 75abf55..20ae6cb 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 @@ -21,7 +21,7 @@ import com.google.gson.annotations.SerializedName; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseRequest; import org.apache.rocketmq.eventbridge.domain.model.apidestination.parameter.HttpApiParameters; import javax.validation.Valid; @@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank; @Getter @Setter @ToString -public class UpdateApiDestinationRequest extends BaseResponse { +public class UpdateApiDestinationRequest extends BaseRequest { @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 ab12d59..e1e7623 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 @@ -21,24 +21,11 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; @AllArgsConstructor @Getter @Setter @ToString -public class UpdateApiDestinationResponse extends BaseResponse { - - public UpdateApiDestinationResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public UpdateApiDestinationResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } +public class UpdateApiDestinationResponse extends BaseDTO { } 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 df10bdc..dae88b6 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 @@ -21,26 +21,14 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; @AllArgsConstructor @Getter @Setter @ToString -public class CreateConnectionResponse extends BaseResponse { +public class CreateConnectionResponse extends BaseDTO { private String connectionName; - public CreateConnectionResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public CreateConnectionResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - 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 1d2c1c5..e776aa6 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 @@ -21,24 +21,11 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; @AllArgsConstructor @Getter @Setter @ToString -public class DeleteConnectionResponse extends BaseResponse { - - public DeleteConnectionResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public DeleteConnectionResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } +public class DeleteConnectionResponse extends BaseDTO { } 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 ea7e192..556c666 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 @@ -22,8 +22,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.AuthParameters; import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.NetworkParameters; @@ -31,7 +30,7 @@ import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.Network @Getter @Setter @ToString -public class GetConnectionResponse extends BaseResponse { +public class GetConnectionResponse extends BaseDTO { @SerializedName("ConnectionName") private String connectionName; @@ -44,16 +43,4 @@ public class GetConnectionResponse extends BaseResponse { @SerializedName("AuthParameters") private AuthParameters authParameters; - - public GetConnectionResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public GetConnectionResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } } 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 ac19252..91020da 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 @@ -22,8 +22,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; import java.util.List; @@ -31,7 +30,7 @@ import java.util.List; @Getter @Setter @ToString -public class ListConnectionResponse extends BaseResponse { +public class ListConnectionResponse extends BaseDTO { @SerializedName("Connections") private List<ConnectionResponse> connections; @@ -44,16 +43,4 @@ public class ListConnectionResponse extends BaseResponse { @SerializedName("MaxResults") private int maxResults; - - public ListConnectionResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public ListConnectionResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } } diff --git a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListEnumsResponse.java b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListEnumsResponse.java index 423db8d..79e7e54 100644 --- a/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListEnumsResponse.java +++ b/adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/connection/ListEnumsResponse.java @@ -20,25 +20,18 @@ package org.apache.rocketmq.eventbridge.adapter.api.dto.connection; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; 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 java.util.List; @Getter @Setter @ToString -public class ListEnumsResponse extends BaseResponse { +public class ListEnumsResponse extends BaseDTO { private List<AuthorizationTypeEnum> authorizationTypeEnums; private List<NetworkTypeEnum> networkTypeEnums; - - public ListEnumsResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } } 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 99707e1..1255765 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 @@ -21,24 +21,11 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseResponse; -import org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode; +import org.apache.rocketmq.eventbridge.adapter.api.dto.BaseDTO; @AllArgsConstructor @Getter @Setter @ToString -public class UpdateConnectionResponse extends BaseResponse { - - public UpdateConnectionResponse success() { - setCode(EventBridgeErrorCode.Success.getCode()); - setMessage(EventBridgeErrorCode.Success.getMsg()); - return this; - } - - public UpdateConnectionResponse parameterCheckFailRes(String errorMsg) { - setCode(Integer.toString(409)); - setMessage(errorMsg); - return this; - } +public class UpdateConnectionResponse extends BaseDTO { } diff --git a/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java b/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java index 4ea9405..25ebb0b 100644 --- a/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java +++ b/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java @@ -18,6 +18,7 @@ package org.apache.rocketmq.eventbridge.adapter.api.controller; import com.google.common.collect.Lists; +import org.apache.rocketmq.eventbridge.adapter.api.dto.ResponseResult; import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.CreateApiDestinationRequest; import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.CreateApiDestinationResponse; import org.apache.rocketmq.eventbridge.adapter.api.dto.apidestination.DeleteApiDestinationRequest; @@ -81,7 +82,7 @@ public class ApiDestinationDTOControllerTest { httpApiParameters.setMethod(UUID.randomUUID().toString()); createApiDestinationRequest.setHttpApiParameters(httpApiParameters); createApiDestinationRequest.setInvocationRateLimitPerSecond(11); - final CreateApiDestinationResponse apiDestination = apiDestinationController.createApiDestination(createApiDestinationRequest); + final ResponseResult<CreateApiDestinationResponse> apiDestination = apiDestinationController.createApiDestination(createApiDestinationRequest); Assert.assertEquals(apiDestination.getCode(), EventBridgeErrorCode.Success.getCode()); } @@ -98,8 +99,8 @@ public class ApiDestinationDTOControllerTest { httpApiParameters.setMethod(UUID.randomUUID().toString()); updateApiDestinationRequest.setHttpApiParameters(httpApiParameters); updateApiDestinationRequest.setInvocationRateLimitPerSecond(11); - final UpdateApiDestinationResponse updateApiDestinationResponse = apiDestinationController.updateApiDestination(updateApiDestinationRequest); - Assert.assertEquals(updateApiDestinationResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<UpdateApiDestinationResponse> updateApiDestinationResponseResponseResult = apiDestinationController.updateApiDestination(updateApiDestinationRequest); + Assert.assertEquals(updateApiDestinationResponseResponseResult.getCode(), EventBridgeErrorCode.Success.getCode()); } @Test @@ -111,7 +112,7 @@ public class ApiDestinationDTOControllerTest { Mockito.when(apiDestinationService.getApiDestination(any(), any())).thenReturn(eventApiDestinationDTO); GetApiDestinationRequest getApiDestinationRequest = new GetApiDestinationRequest(); getApiDestinationRequest.setApiDestinationName(UUID.randomUUID().toString()); - final GetApiDestinationResponse apiDestination = apiDestinationController.getApiDestination(getApiDestinationRequest); + final ResponseResult<GetApiDestinationResponse> apiDestination = apiDestinationController.getApiDestination(getApiDestinationRequest); Assert.assertEquals(apiDestination.getCode(), EventBridgeErrorCode.Success.getCode()); } @@ -122,8 +123,8 @@ public class ApiDestinationDTOControllerTest { Mockito.when(apiDestinationService.deleteApiDestination(any(), any())).thenReturn(Boolean.TRUE); DeleteApiDestinationRequest deleteApiDestinationRequest = new DeleteApiDestinationRequest(); deleteApiDestinationRequest.setApiDestinationName(UUID.randomUUID().toString()); - final DeleteApiDestinationResponse deleteApiDestinationResponse = apiDestinationController.deleteApiDestination(deleteApiDestinationRequest); - Assert.assertEquals(deleteApiDestinationResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<DeleteApiDestinationResponse> deleteApiDestinationResponseResponseResult = apiDestinationController.deleteApiDestination(deleteApiDestinationRequest); + Assert.assertEquals(deleteApiDestinationResponseResponseResult.getCode(), EventBridgeErrorCode.Success.getCode()); } @Test @@ -143,7 +144,7 @@ public class ApiDestinationDTOControllerTest { listApiDestinationsRequest.setApiDestinationNamePrefix(UUID.randomUUID().toString()); listApiDestinationsRequest.setNextToken("0"); listApiDestinationsRequest.setMaxResults(10); - final ListApiDestinationsResponse listApiDestinationsResponse = apiDestinationController.listApiDestinations(listApiDestinationsRequest); - Assert.assertEquals(listApiDestinationsResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<ListApiDestinationsResponse> listApiDestinationsResponseResponseResult = apiDestinationController.listApiDestinations(listApiDestinationsRequest); + Assert.assertEquals(listApiDestinationsResponseResponseResult.getCode(), EventBridgeErrorCode.Success.getCode()); } } diff --git a/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionControllerTest.java b/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionControllerTest.java index b21e8ef..ff87e7a 100644 --- a/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionControllerTest.java +++ b/adapter/api/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ConnectionControllerTest.java @@ -18,6 +18,7 @@ package org.apache.rocketmq.eventbridge.adapter.api.controller; import com.google.common.collect.Lists; +import org.apache.rocketmq.eventbridge.adapter.api.dto.ResponseResult; import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.CreateConnectionRequest; import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.CreateConnectionResponse; import org.apache.rocketmq.eventbridge.adapter.api.dto.connection.DeleteConnectionRequest; @@ -98,7 +99,7 @@ public class ConnectionControllerTest { authParameters.setBasicAuthParameters(basicAuthParameters); authParameters.setAuthorizationType(AuthorizationTypeEnum.BASIC_AUTH.getType()); createConnectionRequest.setAuthParameters(authParameters); - final CreateConnectionResponse connection = connectionController.createConnection(createConnectionRequest); + final ResponseResult<CreateConnectionResponse> connection = connectionController.createConnection(createConnectionRequest); Assert.assertEquals(connection.getCode(), EventBridgeErrorCode.Success.getCode()); } @@ -109,8 +110,8 @@ public class ConnectionControllerTest { Mockito.when(validator.validate(any(DeleteConnectionRequest.class))).thenReturn(constraintViolations); DeleteConnectionRequest deleteConnectionRequest = new DeleteConnectionRequest(); deleteConnectionRequest.setConnectionName(UUID.randomUUID().toString()); - final DeleteConnectionResponse deleteConnectionResponse = connectionController.deleteConnection(deleteConnectionRequest); - Assert.assertEquals(deleteConnectionResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<DeleteConnectionResponse> deleteConnectionResponseResponseResult = connectionController.deleteConnection(deleteConnectionRequest); + Assert.assertEquals(deleteConnectionResponseResponseResult.getCode(), EventBridgeErrorCode.Success.getCode()); } @Test @@ -134,8 +135,8 @@ public class ConnectionControllerTest { authParameters.setBasicAuthParameters(basicAuthParameters); authParameters.setAuthorizationType(AuthorizationTypeEnum.BASIC_AUTH.getType()); updateConnectionRequest.setAuthParameters(authParameters); - final UpdateConnectionResponse updateConnectionResponse = connectionController.updateConnection(updateConnectionRequest); - Assert.assertEquals(updateConnectionResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<UpdateConnectionResponse> updateConnectionResponseResponseResult = connectionController.updateConnection(updateConnectionRequest); + Assert.assertEquals(updateConnectionResponseResponseResult.getCode(), EventBridgeErrorCode.Success.getCode()); } @Test @@ -159,8 +160,8 @@ public class ConnectionControllerTest { BDDMockito.given(connectionService.getConnection(any(), any())).willReturn(connectionDTO); GetConnectionRequest getConnectionRequest = new GetConnectionRequest(); getConnectionRequest.setConnectionName(UUID.randomUUID().toString()); - final GetConnectionResponse getConnectionResponse = connectionController.getConnection(getConnectionRequest); - Assert.assertEquals(getConnectionResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<GetConnectionResponse> connection = connectionController.getConnection(getConnectionRequest); + Assert.assertEquals(connection.getCode(), EventBridgeErrorCode.Success.getCode()); } @Test @@ -180,13 +181,13 @@ public class ConnectionControllerTest { listConnectionRequest.setConnectionNamePrefix(UUID.randomUUID().toString()); listConnectionRequest.setNextToken("0"); listConnectionRequest.setMaxResults(10); - final ListConnectionResponse listConnectionResponse = connectionController.listConnections(listConnectionRequest); - Assert.assertEquals(listConnectionResponse.getCode(), EventBridgeErrorCode.Success.getCode()); + final ResponseResult<ListConnectionResponse> listConnectionResponseResponseResult = connectionController.listConnections(listConnectionRequest); + Assert.assertEquals(listConnectionResponseResponseResult.getCode(), EventBridgeErrorCode.Success.getCode()); } @Test public void testListEnumsResponse() { - final ListEnumsResponse listEnumsResponse = connectionController.listEnumsResponse(); - Assert.assertEquals(listEnumsResponse.getNetworkTypeEnums().size(), NetworkTypeEnum.values().length); + final ResponseResult<ListEnumsResponse> listEnumsResponseResponseResult = connectionController.listEnumsResponse(); + Assert.assertEquals(listEnumsResponseResponseResult.getData().getNetworkTypeEnums().size(), NetworkTypeEnum.values().length); } }
