Skip to content
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

Jump to bottom

[ISSUE #4596]Fix SourceWorker#convertRecordToEvent method converts ConnectRecord to CloudEvent throw NPE #4597

Merged
merged 2 commits into from
Dec 3, 2023
Merged

[ISSUE #4596]Fix SourceWorker#convertRecordToEvent method converts ConnectRecord to CloudEvent throw NPE #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f45438d
[ISSUE #4596]Fix SourceWorker#convertRecordToEvent method converts Co…
mxsm Dec 2, 2023
3a9f192
fix CloudEventUtil#convertRecordToEvent method converts ConnectRecord…
mxsm Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions ...entmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/SourceWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,13 @@ private CloudEvent convertRecordToEvent(ConnectRecord connectRecord) {
.withData(Objects.requireNonNull(JsonUtils.toJSONString(connectRecord.getData())).getBytes(StandardCharsets.UTF_8))
.withExtension("ttl", 10000);

for (String key : connectRecord.getExtensions().keySet()) {
if (CloudEventUtil.validateExtensionType(connectRecord.getExtensionObj(key))) {
cloudEventBuilder.withExtension(key, connectRecord.getExtension(key));
if (connectRecord.getExtensions() != null) {
for (String key : connectRecord.getExtensions().keySet()) {
if (CloudEventUtil.validateExtensionType(connectRecord.getExtensionObj(key))) {
cloudEventBuilder.withExtension(key, connectRecord.getExtension(key));
}
}
}

return cloudEventBuilder.build();
}

Expand Down Expand Up @@ -329,15 +330,15 @@ public boolean commitOffsets() {
log.info("{} Committing offsets for {} acknowledged messages", this, committableOffsets.numCommittableMessages());
if (committableOffsets.hasPending()) {
log.debug("{} There are currently {} pending messages spread across {} source partitions whose offsets will not be committed. "
+ "The source partition with the most pending messages is {}, with {} pending messages",
+ "The source partition with the most pending messages is {}, with {} pending messages",
this,
committableOffsets.numUncommittableMessages(),
committableOffsets.numDeques(),
committableOffsets.largestDequePartition(),
committableOffsets.largestDequeSize());
} else {
log.debug("{} There are currently no pending messages for this offset commit; "
+ "all messages dispatched to the task's producer since the last commit have been acknowledged",
+ "all messages dispatched to the task's producer since the last commit have been acknowledged",
this);
}
}
Expand Down
22 changes: 11 additions & 11 deletions ...-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/util/CloudEventUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.net.URISyntaxException;
import java.time.OffsetDateTime;
import java.util.Objects;
import java.util.Optional;

import io.cloudevents.CloudEvent;
import io.cloudevents.core.builder.CloudEventBuilder;
Expand All @@ -33,32 +34,31 @@
public class CloudEventUtil {

public static CloudEvent convertRecordToEvent(ConnectRecord connectRecord) {
CloudEventBuilder cloudEventBuilder = CloudEventBuilder.v1()
.withData((byte[]) connectRecord.getData());
connectRecord.getExtensions().keySet().forEach(s -> {
switch (s) {
final CloudEventBuilder cloudEventBuilder = CloudEventBuilder.v1().withData((byte[]) connectRecord.getData());
Optional.ofNullable(connectRecord.getExtensions()).ifPresent((extensions) -> extensions.keySet().forEach(key -> {
switch (key) {
case "id":
cloudEventBuilder.withId(connectRecord.getExtension(s));
cloudEventBuilder.withId(connectRecord.getExtension(key));
break;
case "topic":
cloudEventBuilder.withSubject(connectRecord.getExtension(s));
cloudEventBuilder.withSubject(connectRecord.getExtension(key));
break;
case "source":
try {
cloudEventBuilder.withSource(new URI(connectRecord.getExtension(s)));
cloudEventBuilder.withSource(new URI(connectRecord.getExtension(key)));
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
break;
case "type":
cloudEventBuilder.withType(connectRecord.getExtension(s));
cloudEventBuilder.withType(connectRecord.getExtension(key));
break;
default:
if (validateExtensionType(connectRecord.getExtensionObj(s))) {
cloudEventBuilder.withExtension(s, connectRecord.getExtension(s));
if (validateExtensionType(connectRecord.getExtensionObj(key))) {
cloudEventBuilder.withExtension(key, connectRecord.getExtension(key));
}
}
});
}));
return cloudEventBuilder.build();
}

Expand Down