Merge pull request #2149 from Alonexc/fix_bug_2148

[ISSUE #2148] Fix webhook test NPE close #2148
apache · Nov 10, 2022 · 61d90eb · 61d90eb
2 parents c74100a + 7b604af
commit 61d90eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...l-webhook/src/main/java/org/apache/eventmesh/protocol/webhook/WebHookProtocolAdaptor.java b/...l-webhook/src/main/java/org/apache/eventmesh/protocol/webhook/WebHookProtocolAdaptor.java
@@ -21,6 +21,7 @@
 import org.apache.eventmesh.common.protocol.ProtocolTransportObject;
 import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
 import org.apache.eventmesh.common.protocol.http.WebhookProtocolTransportObject;
+import org.apache.eventmesh.common.utils.RandomStringUtils;
 import org.apache.eventmesh.protocol.api.ProtocolAdaptor;
 import org.apache.eventmesh.protocol.api.exception.ProtocolHandleException;
 
@@ -47,6 +48,8 @@ public CloudEvent toCloudEvent(WebhookProtocolTransportObject protocol) throws P
             .withType(protocol.getEventType())
             .withData(protocol.getBody())
             .withExtension(Constants.PROTOCOL_TYPE, "webhook")
+            .withExtension("bizseqno", RandomStringUtils.generateNum(30))
+            .withExtension("uniqueid", RandomStringUtils.generateNum(30))
             .build();
     }
 

diff --git a/.../main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java b/.../main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
@@ -54,7 +54,7 @@ public ShowListenClientByTopicHandler(EventMeshTCPServer eventMeshTCPServer) {
     @Override
     public void handle(HttpExchange httpExchange) throws IOException {
         StringBuilder result = new StringBuilder();
-        try(OutputStream out = httpExchange.getResponseBody();) {
+        try (OutputStream out = httpExchange.getResponseBody()) {
             String queryString = httpExchange.getRequestURI().getQuery();
             Map<String, String> queryStringInfo = NetUtils.formData2Dic(queryString);
             String topic = queryStringInfo.get(EventMeshConstants.MANAGE_TOPIC);