You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2021/02/19 17:32:58 UTC
[pulsar] branch master updated: Fix writing/encoding of
GenericJsonRecord (#9608)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 41e118a Fix writing/encoding of GenericJsonRecord (#9608)
41e118a is described below
commit 41e118a0c7d226b4f71edc8e374bd8a8fe777d61
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Feb 19 19:32:22 2021 +0200
Fix writing/encoding of GenericJsonRecord (#9608)
* Fix writing/encoding of GenericJsonRecord
- Fixes #9605
* Add test for JSONSchema encode/decode round-trip
---
.../impl/schema/generic/GenericJsonWriter.java | 5 +-
.../pulsar/client/impl/schema/JSONSchemaTest.java | 54 ++++++++++++++++----
.../impl/schema/generic/GenericJsonRecordTest.java | 59 +++++++++++++++++++---
3 files changed, 99 insertions(+), 19 deletions(-)
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java
index 52b23e8..daab830 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java
@@ -19,12 +19,11 @@
package org.apache.pulsar.client.impl.schema.generic;
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
import org.apache.pulsar.client.api.SchemaSerializationException;
import org.apache.pulsar.client.api.schema.GenericRecord;
import org.apache.pulsar.client.api.schema.SchemaWriter;
-import java.io.IOException;
-
public class GenericJsonWriter implements SchemaWriter<GenericRecord> {
private final ObjectMapper objectMapper;
@@ -36,7 +35,7 @@ public class GenericJsonWriter implements SchemaWriter<GenericRecord> {
@Override
public byte[] write(GenericRecord message) {
try {
- return objectMapper.writeValueAsBytes(((GenericJsonRecord)message).getJsonNode().toString());
+ return objectMapper.writeValueAsBytes(((GenericJsonRecord)message).getJsonNode());
} catch (IOException ioe) {
throw new SchemaSerializationException(ioe);
}
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java
index d17bbf0..add4e7d 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java
@@ -18,11 +18,18 @@
*/
package org.apache.pulsar.client.impl.schema;
-import java.util.Collections;
-import java.util.List;
-
+import static org.apache.pulsar.client.impl.schema.SchemaTestUtils.FOO_FIELDS;
+import static org.apache.pulsar.client.impl.schema.SchemaTestUtils.SCHEMA_JSON_ALLOW_NULL;
+import static org.apache.pulsar.client.impl.schema.SchemaTestUtils.SCHEMA_JSON_NOT_ALLOW_NULL;
+import static org.testng.Assert.assertEquals;
+import com.fasterxml.jackson.core.JsonProcessingException;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
+import java.util.Collections;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.avro.Schema;
import org.apache.pulsar.client.api.SchemaSerializationException;
@@ -33,15 +40,10 @@ import org.apache.pulsar.client.impl.schema.SchemaTestUtils.Foo;
import org.apache.pulsar.client.impl.schema.SchemaTestUtils.NestedBar;
import org.apache.pulsar.client.impl.schema.SchemaTestUtils.NestedBarList;
import org.apache.pulsar.common.schema.SchemaType;
+import org.json.JSONException;
import org.skyscreamer.jsonassert.JSONAssert;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.json.JSONException;
-
-import static org.apache.pulsar.client.impl.schema.SchemaTestUtils.FOO_FIELDS;
-import static org.apache.pulsar.client.impl.schema.SchemaTestUtils.SCHEMA_JSON_NOT_ALLOW_NULL;
-import static org.apache.pulsar.client.impl.schema.SchemaTestUtils.SCHEMA_JSON_ALLOW_NULL;
-import static org.testng.Assert.assertEquals;
@Slf4j
public class JSONSchemaTest {
@@ -332,4 +334,38 @@ public class JSONSchemaTest {
assertEquals(jsonSchema.decode(byteBuf), foo1);
}
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ private static class Seller {
+ public String state;
+ public String street;
+ public long zipCode;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ private static class PC {
+ public String brand;
+ public String model;
+ public int year;
+ public GPU gpu;
+ public Seller seller;
+ }
+
+ private enum GPU {
+ AMD, NVIDIA
+ }
+
+ @Test
+ public void testEncodeAndDecodeObject() throws JsonProcessingException {
+ JSONSchema<PC> jsonSchema = JSONSchema.of(SchemaDefinition.<PC>builder().withPojo(PC.class).build());
+ PC pc = new PC("dell", "alienware", 2021, GPU.AMD,
+ new Seller("WA", "street", 98004));
+ byte[] encoded = jsonSchema.encode(pc);
+ PC roundtrippedPc = jsonSchema.decode(encoded);
+ assertEquals(roundtrippedPc, pc);
+ }
}
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java
index 6486a24..d64c222 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java
@@ -18,17 +18,23 @@
*/
package org.apache.pulsar.client.impl.schema.generic;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.testng.annotations.Test;
-
-import java.util.Collections;
-
import static java.nio.charset.StandardCharsets.UTF_8;
-import org.apache.pulsar.client.api.schema.Field;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.pulsar.client.api.schema.Field;
+import org.apache.pulsar.client.api.schema.GenericSchema;
+import org.apache.pulsar.client.api.schema.SchemaDefinition;
+import org.apache.pulsar.client.impl.schema.JSONSchema;
+import org.apache.pulsar.common.util.ObjectMapperFactory;
+import org.testng.annotations.Test;
public class GenericJsonRecordTest {
@@ -67,4 +73,43 @@ public class GenericJsonRecordTest {
Object boolValue = record.getField("on");
assertTrue((boolean)boolValue);
}
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ private static class Seller {
+ public String state;
+ public String street;
+ public long zipCode;
+ }
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ private static class PC {
+ public String brand;
+ public String model;
+ public int year;
+ public GPU gpu;
+ public Seller seller;
+ }
+
+ private enum GPU {
+ AMD, NVIDIA
+ }
+
+ @Test
+ public void testEncodeAndDecodeObject() throws JsonProcessingException {
+ // test case from issue https://github.com/apache/pulsar/issues/9605
+ JSONSchema<PC> jsonSchema = JSONSchema.of(SchemaDefinition.<PC>builder().withPojo(PC.class).build());
+ GenericSchema genericJsonSchema = GenericJsonSchema.of(jsonSchema.getSchemaInfo());
+ PC pc = new PC("dell", "alienware", 2021, GPU.AMD,
+ new Seller("WA", "street", 98004));
+ JsonNode jsonNode = ObjectMapperFactory.getThreadLocal().valueToTree(pc);
+ GenericJsonRecord genericJsonRecord =
+ new GenericJsonRecord(null, null, jsonNode, genericJsonSchema.getSchemaInfo());
+ byte[] encoded = genericJsonSchema.encode(genericJsonRecord);
+ PC roundtrippedPc = jsonSchema.decode(encoded);
+ assertEquals(roundtrippedPc, pc);
+ }
}
\ No newline at end of file