From 48fc238e131018aa377f3dfdf80724698ea6bfeb Mon Sep 17 00:00:00 2001 From: Zahaan Date: Fri, 19 May 2023 10:12:29 +0530 Subject: [PATCH 1/3] fixes [Enhancement] #3963 --- .../runtime/admin/handler/QueryWebHookConfigByIdHandler.java | 3 ++- .../admin/handler/QueryWebHookConfigByManufacturerHandler.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java index 55e726e455..9aab31f6c8 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.io.OutputStream; +import java.util.Objects; import com.sun.net.httpserver.HttpExchange; @@ -60,7 +61,7 @@ public void handle(HttpExchange httpExchange) throws IOException { try (OutputStream out = httpExchange.getResponseBody()) { WebHookConfig result = operation.queryWebHookConfigById(webHookConfig); // operating result - out.write(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET)); + out.write(Objects.requireNonNull(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET))); } catch (Exception e) { log.error("get WebHookConfigOperation implementation Failed.", e); } diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java index f49e7942d3..dea40f8108 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java @@ -73,7 +73,7 @@ public void handle(HttpExchange httpExchange) throws IOException { try (OutputStream out = httpExchange.getResponseBody()) { List result = operation.queryWebHookConfigByManufacturer(webHookConfig, pageNum, pageSize); // operating result - out.write(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET)); + out.write(Objects.requireNonNull(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET))); } catch (Exception e) { log.error("get WebHookConfigOperation implementation Failed.", e); } From 7c8e3aceb746d5faaca53a5b2acc0ffae861db66 Mon Sep 17 00:00:00 2001 From: Zahaan Date: Fri, 19 May 2023 14:12:45 +0530 Subject: [PATCH 2/3] Fix Updated --- .../runtime/admin/handler/QueryWebHookConfigByIdHandler.java | 2 +- .../admin/handler/QueryWebHookConfigByManufacturerHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java index 9aab31f6c8..cb399b3e5e 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java @@ -61,7 +61,7 @@ public void handle(HttpExchange httpExchange) throws IOException { try (OutputStream out = httpExchange.getResponseBody()) { WebHookConfig result = operation.queryWebHookConfigById(webHookConfig); // operating result - out.write(Objects.requireNonNull(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET))); + out.write(Objects.requireNonNull(JsonUtils.toJSONString(result)).getBytes(Constants.DEFAULT_CHARSET)); } catch (Exception e) { log.error("get WebHookConfigOperation implementation Failed.", e); } diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java index dea40f8108..3a16cce36c 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java @@ -73,7 +73,7 @@ public void handle(HttpExchange httpExchange) throws IOException { try (OutputStream out = httpExchange.getResponseBody()) { List result = operation.queryWebHookConfigByManufacturer(webHookConfig, pageNum, pageSize); // operating result - out.write(Objects.requireNonNull(JsonUtils.toJSONString(result).getBytes(Constants.DEFAULT_CHARSET))); + out.write(Objects.requireNonNull(JsonUtils.toJSONString(result)).getBytes(Constants.DEFAULT_CHARSET)); } catch (Exception e) { log.error("get WebHookConfigOperation implementation Failed.", e); } From 3a09c7460e39f61d258d657c6b34b4b9ca0d1f36 Mon Sep 17 00:00:00 2001 From: mike_xwm Date: Mon, 22 May 2023 10:31:08 +0800 Subject: [PATCH 3/3] Update QueryWebHookConfigByIdHandler.java --- .../runtime/admin/handler/QueryWebHookConfigByIdHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java index cb399b3e5e..35ea9a6714 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java @@ -30,7 +30,6 @@ import java.io.IOException; import java.io.OutputStream; - import java.util.Objects; import com.sun.net.httpserver.HttpExchange;