[ISSUE #3649] Method invocation may produce 'NullPointerException'.[C…

…loudEventsProtocolAdaptor] (#3660) [ISSUE #3649] Method invocation may produce 'NullPointerException'.[CloudEventsProtocolAdaptor]
apache · Apr 13, 2023 · 906fcdb · 906fcdb
1 parent b07793f
commit 906fcdb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...s/src/main/java/org/apache/eventmesh/protocol/cloudevents/CloudEventsProtocolAdaptor.java b/...s/src/main/java/org/apache/eventmesh/protocol/cloudevents/CloudEventsProtocolAdaptor.java
@@ -38,10 +38,10 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.format.EventFormat;
@@ -118,7 +118,7 @@ public List<CloudEvent> toBatchCloudEvent(ProtocolTransportObject protocol)
     @Override
     public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws ProtocolHandleException {
         Preconditions.checkNotNull(cloudEvent, "cloudEvent cannot be null");
-        String protocolDesc = cloudEvent.getExtension(Constants.PROTOCOL_DESC).toString();
+        String protocolDesc = Objects.requireNonNull(cloudEvent.getExtension(Constants.PROTOCOL_DESC)).toString();
         if (StringUtils.equals("http", protocolDesc)) {
             HttpCommand httpCommand = new HttpCommand();
             Body body = new Body() {
@@ -127,8 +127,9 @@ public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws Prot
                 @Override
                 public Map<String, Object> toMap() {
                     byte[] eventByte =
-                        EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE).serialize(cloudEvent);
-                    map.put("content", new String(eventByte, StandardCharsets.UTF_8));
+                        Objects.requireNonNull(EventFormatProvider.getInstance()
+                            .resolveFormat(JsonFormat.CONTENT_TYPE)).serialize(cloudEvent);
+                    map.put("content", new String(eventByte, Constants.DEFAULT_CHARSET));
                     return map;
                 }
             };