Skip to content

[ISSUE #3106] Null check for dataContentMap in HttpProtocolAdaptor.java #3131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mytang0 merged 3 commits into from
Feb 14, 2023
Merged

[ISSUE #3106] Null check for dataContentMap in HttpProtocolAdaptor.java #3131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
929931f
Issue #3106 Update HttpProtocolAdaptor.java
PreetAngadSingh Feb 13, 2023
4afd25a
Updated HttpProtocolAdaptor.java
PreetAngadSingh Feb 14, 2023
7db1e6d
Issue #3106 Updated whitespace after comma in HttpProtocolAdapter.java
PreetAngadSingh Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...h-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolAdaptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;

import io.cloudevents.CloudEvent;
Expand Down Expand Up @@ -101,8 +102,10 @@ public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws Prot
new String(cloudEvent.getData().toBytes(), Constants.DEFAULT_CHARSET),
new TypeReference<Map<String, Object>>() {
});
String requestHeader = JsonUtils.toJSONString(dataContentMap.get(CONSTANTS_KEY_HEADERS));
byte[] requestBody = JsonUtils.toJSONString(dataContentMap.get(CONSTANTS_KEY_BODY)).getBytes(StandardCharsets.UTF_8);
String requestHeader = JsonUtils.toJSONString(
Objects.requireNonNull(dataContentMap, "Headers must not be null").get(CONSTANTS_KEY_HEADERS));
byte[] requestBody = Objects.requireNonNull(
JsonUtils.toJSONString(dataContentMap.get(CONSTANTS_KEY_BODY)), "Body must not be null").getBytes(StandardCharsets.UTF_8);
Map<String, Object> requestHeaderMap = JsonUtils.parseTypeReferenceObject(requestHeader, new TypeReference<Map<String, Object>>() {
});
String requestURI = dataContentMap.get(CONSTANTS_KEY_PATH).toString();
Expand Down