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 7d771e583c8bce2171fbe4696c6fa02bc0a64dbf Author: zh378814 <[email protected]> AuthorDate: Mon Jun 13 17:00:51 2022 +0800 Add comments and delete redundant folders --- .../eventbridge/adapter/api/controller/ConnectionController.java | 2 +- .../adapter/api/dto/connection/ListEnumsResponse.java | 9 ++++++++- .../mybatis/converter/ApiDestinationConverter.java | 2 +- .../mybatis/repository/MybatisApiDestinationRepository.java | 2 +- .../adapter/rpc/impl/{kms => }/SecretManagerAPIImpl.java | 2 +- .../eventbridge/domain/common/enums/AuthorizationTypeEnum.java | 9 +++++++++ .../eventbridge/domain/common/enums/NetworkTypeEnum.java | 6 ++++++ 7 files changed, 27 insertions(+), 5 deletions(-) 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 b538274..357b2df 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 @@ -138,7 +138,7 @@ public class ConnectionController { ListEnumsResponse listEnumsResponse = new ListEnumsResponse(); listEnumsResponse.setAuthorizationTypeEnums(Arrays.stream(AuthorizationTypeEnum.values()).collect(Collectors.toList())); listEnumsResponse.setNetworkTypeEnums(Arrays.stream(NetworkTypeEnum.values()).collect(Collectors.toList())); - return listEnumsResponse; + return listEnumsResponse.success(); } private ConnectionDTO getEventConnectionWithBLOBs(BaseRequest baseRequest) { 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 d19cb67..423db8d 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,18 +20,25 @@ 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.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 { +public class ListEnumsResponse extends BaseResponse { 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/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java index a5ec9d8..abe2c13 100644 --- a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java +++ b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java @@ -49,7 +49,7 @@ public class ApiDestinationConverter { return apiDestinationDTO; } - public static List<ApiDestinationDTO> doListCoverterDtoList(List<ApiDestinationDO> apiDestinationDOS) { + public static List<ApiDestinationDTO> doListConverterDtoList(List<ApiDestinationDO> apiDestinationDOS) { return apiDestinationDOS.stream().map(ApiDestinationConverter::doConverterDto).collect(Collectors.toList()); } diff --git a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/repository/MybatisApiDestinationRepository.java b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/repository/MybatisApiDestinationRepository.java index 1258391..195b1a5 100644 --- a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/repository/MybatisApiDestinationRepository.java +++ b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/repository/MybatisApiDestinationRepository.java @@ -65,7 +65,7 @@ public class MybatisApiDestinationRepository implements ApiDestinationRepository @Override public List<ApiDestinationDTO> listApiDestinations(String accountId, String apiDestinationName, String nextToken, int maxResults) { - return ApiDestinationConverter.doListCoverterDtoList(eventApiDestinationMapper.listApiDestinations(accountId, apiDestinationName, Integer.parseInt(nextToken), maxResults)); + return ApiDestinationConverter.doListConverterDtoList(eventApiDestinationMapper.listApiDestinations(accountId, apiDestinationName, Integer.parseInt(nextToken), maxResults)); } @Override diff --git a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/kms/SecretManagerAPIImpl.java b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/SecretManagerAPIImpl.java similarity index 95% rename from adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/kms/SecretManagerAPIImpl.java rename to adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/SecretManagerAPIImpl.java index 6b7f0fb..e25c104 100644 --- a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/kms/SecretManagerAPIImpl.java +++ b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/SecretManagerAPIImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.rocketmq.eventbridge.adapter.rpc.impl.kms; +package org.apache.rocketmq.eventbridge.adapter.rpc.impl; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.eventbridge.domain.rpc.SecretManagerAPI; diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/AuthorizationTypeEnum.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/AuthorizationTypeEnum.java index 5b13595..ca0948c 100644 --- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/AuthorizationTypeEnum.java +++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/AuthorizationTypeEnum.java @@ -22,8 +22,17 @@ import lombok.Getter; @Getter public enum AuthorizationTypeEnum { + /** + * API_KEY_AUTH + */ API_KEY_AUTH("API_KEY_AUTH"), + /** + * BASIC_AUTH + */ BASIC_AUTH("BASIC_AUTH"), + /** + * OAUTH_AUTH + */ OAUTH_AUTH("OAUTH_AUTH"); private final String type; diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/NetworkTypeEnum.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/NetworkTypeEnum.java index 4ff15a1..e690a58 100644 --- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/NetworkTypeEnum.java +++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/common/enums/NetworkTypeEnum.java @@ -22,7 +22,13 @@ import lombok.Getter; @Getter public enum NetworkTypeEnum { + /** + * PublicNetwork + */ PUBLIC_NETWORK("PublicNetwork"), + /** + * PrivateNetwork + */ PRIVATE_NETWORK("PrivateNetwork"); private final String networkType;
