Skip to content

FIX: NPE in JsonCodec with keyName #5659

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
chenqi0805 merged 1 commit into from
Apr 26, 2025
Merged

FIX: NPE in JsonCodec with keyName #5659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void parse(InputStream inputStream, Instant timeReceived, Consumer<Record
}

if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) {
if (keyName != null && !nodeName.equals(keyName)) {
if (keyName != null && !keyName.equals(nodeName)) {
continue;
}
parseRecordsArray(jsonParser, timeReceived, eventConsumer, includeKeysMap, includeMetadataKeysMap);
Expand Down
14 changes: 14 additions & 0 deletions data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonDecoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,20 @@ void test_basicJsonDecoder_withInputConfig() throws IOException {
assertThat(receivedTime, equalTo(now));
}

@Test
void test_JsonDecoder_withKeyName_when_parsing_json_array_should_skip() throws IOException {
final Instant now = Instant.now();
String inputString = "[]";
List<Record<Event>> records = new ArrayList<>();
jsonDecoder = new JsonDecoder(key_name, null, null, maxEventLength);
jsonDecoder.parse(new ByteArrayInputStream(inputString.getBytes()), now, (record) -> {
records.add(record);
receivedTime = record.getData().getEventHandle().getInternalOriginationTime();
});

assertTrue(records.isEmpty());
}

@Test
void test_basicJsonDecoder_withInputConfig_withoutEvents_empty_metadata_keys() throws IOException {
final Instant now = Instant.now();
Expand Down
Loading