commit bd14cfb10a42bccb0588c207ff6e54f524992b6e
author zh378814 <wb-zh378814@alibaba-inc.com> Tue Sep 05 11:14:54 2023 +0800
committer shenlin <2011shenlin@gmail.com> Tue Sep 05 14:05:29 2023 +0800
tree 2124976f698075d1847d78e51e11f2fcff55833a
parent 68432d1202ca9c7dd73b016e5ad8ac71fddad59c

fix api destination update

adapter/api/src/main/java/org/apache/rocketmq/eventbridge/adapter/api/dto/apidestination/UpdateApiDestinationRequest.java

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 d730daf..8430495 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
@@ -40,9 +40,6 @@
     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.")
-    @Length(min = 2, max = 127, message = "The connection name length cannot exceed 127.")
-    @NotBlank(message = "ConnectionName is blank.")
     private String connectionName;
 
     @SerializedName("Description")

domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/apidestination/ApiDestinationService.java

diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/apidestination/ApiDestinationService.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/apidestination/ApiDestinationService.java
index 5563c73..0a1c9a0 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/apidestination/ApiDestinationService.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/apidestination/ApiDestinationService.java
@@ -100,8 +100,23 @@
         if (checkApiDestination(apiDestinationDTO.getAccountId(), apiDestinationDTO.getName()) == null) {
             throw new EventBridgeException(EventBridgeErrorCode.ApiDestinationNotExist, apiDestinationDTO.getName());
         }
-        checkHttpApiParameters(apiDestinationDTO.getApiParams());
-        checkConnection(apiDestinationDTO);
+        ApiDestinationDTO oldApiDestination = getApiDestination(apiDestinationDTO.getAccountId(), apiDestinationDTO.getName());
+        if (StringUtils.isBlank(apiDestinationDTO.getConnectionName())) {
+            apiDestinationDTO.setConnectionName(oldApiDestination.getConnectionName());
+        }
+        if (apiDestinationDTO.getApiParams() == null) {
+            apiDestinationDTO.setApiParams(oldApiDestination.getApiParams());
+        } else {
+            HttpApiParameters apiParams = apiDestinationDTO.getApiParams();
+            HttpApiParameters oldApiParams = oldApiDestination.getApiParams();
+            if (StringUtils.isBlank(apiParams.getEndpoint())) {
+                apiParams.setEndpoint(oldApiParams.getEndpoint());
+            }
+            if (StringUtils.isBlank(apiParams.getMethod())) {
+                apiParams.setMethod(oldApiParams.getMethod());
+            }
+            apiDestinationDTO.setApiParams(apiParams);
+        }
         return apiDestinationRepository.updateApiDestination(apiDestinationDTO);
     }