This is an automated email from the ASF dual-hosted git repository.

shenlin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git

commit 3a9eac3e660ccb72137ff0741ea6b0fd8ff7353e
Merge: c4e4b65 e11edf7
Author: shenlin <[email protected]>
AuthorDate: Thu Oct 20 10:43:48 2022 +0800

    Merge remote-tracking branch 'origin/main' into develop
    
    # Conflicts:
    #       
adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/handler/WebLogAspect.java
    #       
adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/SecretManagerAPIImpl.java
    #       
domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/apidestination/ApiDestinationService.java
    #       
domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
    #       
domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/SecretManagerAPI.java
    #       
start/src/main/java/org/apache/rocketmq/eventbridge/handler/ExceptionHandler.java
    #       start/src/main/resources/logback-spring.xml

 adapter/api/pom.xml                                |   4 +-
 .../adapter/api/handler/WebLogAspect.java          |  32 +++--
 adapter/persistence/pom.xml                        |   4 +-
 adapter/pom.xml                                    |   2 +-
 adapter/rpc/pom.xml                                |   4 +-
 .../adapter/rpc/impl/SecretManagerAPIImpl.java     |   7 +-
 common/pom.xml                                     |   2 +-
 .../eventbridge/config/EventBridgeConstants.java   |   1 +
 .../exception/EventBridgeException.java            |   5 +
 domain/pom.xml                                     |   2 +-
 .../common/exception/EventBridgeErrorCode.java     |   6 +-
 .../apidestination/ApiDestinationService.java      |  79 +++++-------
 .../domain/model/connection/ConnectionService.java | 135 ++++++++-------------
 .../eventbridge/domain/rpc/SecretManagerAPI.java   |   7 +-
 ...iceTest.java => ApiDestinationServiceTest.java} |   8 +-
 pom.xml                                            |   4 +-
 start/pom.xml                                      |   2 +-
 .../rocketmq/eventbridge/filter/LogFilter.java     |  77 ++++++++++++
 .../eventbridge/handler/ExceptionHandler.java      |  12 +-
 start/src/main/resources/logback-spring.xml        |  17 +++
 supports/connect-filter-transform/pom.xml          |   2 +-
 21 files changed, 234 insertions(+), 178 deletions(-)

Reply via email to