You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by rh...@apache.org on 2020/02/12 21:58:03 UTC
[kafka] branch 2.4 updated: KAFKA-9192: fix NPE when for converting
optional json schema in structs (#7733)
This is an automated email from the ASF dual-hosted git repository.
rhauch pushed a commit to branch 2.4
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.4 by this push:
new 452d93c KAFKA-9192: fix NPE when for converting optional json schema in structs (#7733)
452d93c is described below
commit 452d93c3c2bb46a2094aa7cbec05386c6209a636
Author: Lev Zemlyanov <lz...@purdue.edu>
AuthorDate: Wed Feb 12 13:44:23 2020 -0800
KAFKA-9192: fix NPE when for converting optional json schema in structs (#7733)
Author: Lev Zemlyanov <le...@confluent.io>
Reviewers: Greg Harris <gr...@confluent.io>, Randall Hauch <rh...@gmail.com>
---
.../main/java/org/apache/kafka/connect/json/JsonConverter.java | 2 +-
.../java/org/apache/kafka/connect/json/JsonConverterTest.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
index fe83ddf..3ef6aae 100644
--- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
+++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
@@ -708,7 +708,7 @@ public class JsonConverter implements Converter, HeaderConverter {
final Schema.Type schemaType;
if (schema != null) {
schemaType = schema.type();
- if (jsonValue.isNull()) {
+ if (jsonValue == null || jsonValue.isNull()) {
if (schema.defaultValue() != null)
return schema.defaultValue(); // any logical type conversions should already have been applied
if (schema.isOptional())
diff --git a/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java b/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java
index fb9d8cb..2a56950 100644
--- a/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java
+++ b/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java
@@ -174,6 +174,15 @@ public class JsonConverterTest {
}
@Test
+ public void structWithOptionalFieldToConnect() {
+ byte[] structJson = "{ \"schema\": { \"type\": \"struct\", \"fields\": [{ \"field\":\"optional\", \"type\": \"string\", \"optional\": true }, { \"field\": \"required\", \"type\": \"string\" }] }, \"payload\": { \"required\": \"required\" } }".getBytes();
+ Schema expectedSchema = SchemaBuilder.struct().field("optional", Schema.OPTIONAL_STRING_SCHEMA).field("required", Schema.STRING_SCHEMA).build();
+ Struct expected = new Struct(expectedSchema).put("required", "required");
+ SchemaAndValue converted = converter.toConnectData(TOPIC, structJson);
+ assertEquals(new SchemaAndValue(expectedSchema, expected), converted);
+ }
+
+ @Test
public void nullToConnect() {
// When schemas are enabled, trying to decode a tombstone should be an empty envelope
// the behavior is the same as when the json is "{ "schema": null, "payload": null }"