This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 761fce69c [ISSUE #3097] Require non-null for methods
serialize/deserialize/getBytes
new 33584a1a4 Merge pull request #3138 from PickBas/fix-3097
761fce69c is described below
commit 761fce69c0ef77ee3ee6c01fa34c35c0b4870ce5
Author: Kirill Saied <[email protected]>
AuthorDate: Tue Feb 14 22:10:36 2023 +0300
[ISSUE #3097] Require non-null for methods serialize/deserialize/getBytes
---
.../eventmesh/runtime/admin/handler/EventHandler.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
index aa8071959..168722c95 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/EventHandler.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,14 +120,14 @@ public class EventHandler extends AbstractHttpHandler {
List<String> eventJsonList = new ArrayList<>();
for (CloudEvent event : eventList) {
- byte[] serializedEvent = EventFormatProvider
- .getInstance()
- .resolveFormat(JsonFormat.CONTENT_TYPE)
+ byte[] serializedEvent =
Objects.requireNonNull(EventFormatProvider
+ .getInstance()
+ .resolveFormat(JsonFormat.CONTENT_TYPE))
.serialize(event);
eventJsonList.add(new String(serializedEvent,
StandardCharsets.UTF_8));
}
String result = JsonUtils.toJSONString(eventJsonList);
- httpExchange.sendResponseHeaders(200, result.getBytes().length);
+ httpExchange.sendResponseHeaders(200,
Objects.requireNonNull(result).getBytes().length);
out.write(result.getBytes());
} catch (Exception e) {
StringWriter writer = new StringWriter();
@@ -162,9 +163,9 @@ public class EventHandler extends AbstractHttpHandler {
try {
String request =
HttpExchangeUtils.streamToString(httpExchange.getRequestBody());
byte[] rawRequest = request.getBytes(StandardCharsets.UTF_8);
- CloudEvent event = EventFormatProvider
+ CloudEvent event = Objects.requireNonNull(EventFormatProvider
.getInstance()
-
.resolveFormat(JsonFormat.CONTENT_TYPE).deserialize(rawRequest);
+
.resolveFormat(JsonFormat.CONTENT_TYPE)).deserialize(rawRequest);
admin.publish(event);
httpExchange.sendResponseHeaders(200, 0);
} catch (Exception e) {
@@ -176,7 +177,7 @@ public class EventHandler extends AbstractHttpHandler {
Error error = new Error(e.toString(), stackTrace);
String result = JsonUtils.toJSONString(error);
- httpExchange.sendResponseHeaders(500, result.getBytes().length);
+ httpExchange.sendResponseHeaders(500,
Objects.requireNonNull(result).getBytes().length);
out.write(result.getBytes());
} finally {
if (out != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
