You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/09/19 03:17:19 UTC
[GitHub] srkukarni closed pull request #2577: fix behavior of JSONSchema for
derived classes
srkukarni closed pull request #2577: fix behavior of JSONSchema for derived classes
URL: https://github.com/apache/incubator-pulsar/pull/2577
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pulsar-client-schema/pom.xml b/pulsar-client-schema/pom.xml
index 477627e77b..5e72f6bfeb 100644
--- a/pulsar-client-schema/pom.xml
+++ b/pulsar-client-schema/pom.xml
@@ -70,6 +70,12 @@
<artifactId>jackson-module-jsonSchema</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+
<!-- Testing dependencies -->
<dependency>
<groupId>org.apache.pulsar</groupId>
diff --git a/pulsar-client-schema/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java b/pulsar-client-schema/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java
index 5465f8c185..d46c84b570 100644
--- a/pulsar-client-schema/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java
+++ b/pulsar-client-schema/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java
@@ -22,28 +22,53 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
import com.fasterxml.jackson.module.jsonSchema.JsonSchemaGenerator;
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.extern.slf4j.Slf4j;
import org.apache.avro.reflect.ReflectData;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SchemaSerializationException;
import org.apache.pulsar.common.schema.SchemaInfo;
import org.apache.pulsar.common.schema.SchemaType;
-import java.io.IOException;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
+@Slf4j
public class JSONSchema<T> implements Schema<T>{
private final org.apache.avro.Schema schema;
private final SchemaInfo schemaInfo;
- private final ObjectMapper objectMapper;
+ private final Gson gson;
private final Class<T> pojo;
private Map<String, String> properties;
private JSONSchema(Class<T> pojo, Map<String, String> properties) {
this.pojo = pojo;
this.properties = properties;
- this.objectMapper = new ObjectMapper();
+ this.gson = new GsonBuilder().addSerializationExclusionStrategy(new ExclusionStrategy() {
+ Set<String> classes = new HashSet<>();
+
+ @Override
+ public boolean shouldSkipField(FieldAttributes f) {
+ boolean skip = !(f.getDeclaringClass().equals(pojo)
+ || classes.contains(f.getDeclaringClass().getName())
+ || f.getDeclaringClass().isAssignableFrom(pojo));
+ if (!skip) {
+ classes.add(f.getDeclaredClass().getName());
+ }
+ return skip;
+ }
+
+ @Override
+ public boolean shouldSkipClass(Class<?> clazz) {
+ return false;
+ }
+ }).create();
this.schema = ReflectData.AllowNull.get().getSchema(pojo);
this.schemaInfo = new SchemaInfo();
@@ -55,9 +80,10 @@ private JSONSchema(Class<T> pojo, Map<String, String> properties) {
@Override
public byte[] encode(T message) throws SchemaSerializationException {
+
try {
- return objectMapper.writeValueAsBytes(message);
- } catch (JsonProcessingException e) {
+ return this.gson.toJson(message).getBytes();
+ } catch (RuntimeException e) {
throw new SchemaSerializationException(e);
}
}
@@ -65,8 +91,8 @@ private JSONSchema(Class<T> pojo, Map<String, String> properties) {
@Override
public T decode(byte[] bytes) {
try {
- return objectMapper.readValue(new String(bytes), pojo);
- } catch (IOException e) {
+ return this.gson.fromJson(new String(bytes), this.pojo);
+ } catch (RuntimeException e) {
throw new RuntimeException(new SchemaSerializationException(e));
}
}
@@ -85,6 +111,7 @@ public SchemaInfo getSchemaInfo() {
public SchemaInfo getBackwardsCompatibleJsonSchemaInfo() {
SchemaInfo backwardsCompatibleSchemaInfo;
try {
+ ObjectMapper objectMapper = new ObjectMapper();
JsonSchemaGenerator schemaGen = new JsonSchemaGenerator(objectMapper);
JsonSchema jsonBackwardsCompatibileSchema = schemaGen.generateSchema(pojo);
backwardsCompatibleSchemaInfo = new SchemaInfo();
diff --git a/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/JSONSchemaTest.java b/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/JSONSchemaTest.java
index 7a677f4e69..c7b16bf0fa 100644
--- a/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/JSONSchemaTest.java
+++ b/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/JSONSchemaTest.java
@@ -18,17 +18,20 @@
*/
package org.apache.pulsar.client.schema;
-import static org.apache.pulsar.client.schema.SchemaTestUtils.FOO_FIELDS;
-import static org.apache.pulsar.client.schema.SchemaTestUtils.SCHEMA_JSON;
-
+import lombok.extern.slf4j.Slf4j;
import org.apache.avro.Schema;
import org.apache.pulsar.client.impl.schema.JSONSchema;
import org.apache.pulsar.client.schema.SchemaTestUtils.Bar;
+import org.apache.pulsar.client.schema.SchemaTestUtils.DerivedFoo;
import org.apache.pulsar.client.schema.SchemaTestUtils.Foo;
import org.apache.pulsar.common.schema.SchemaType;
import org.testng.Assert;
import org.testng.annotations.Test;
+import static org.apache.pulsar.client.schema.SchemaTestUtils.FOO_FIELDS;
+import static org.apache.pulsar.client.schema.SchemaTestUtils.SCHEMA_JSON;
+
+@Slf4j
public class JSONSchemaTest {
@Test
@@ -37,6 +40,7 @@ public void testSchema() {
Assert.assertEquals(jsonSchema.getSchemaInfo().getType(), SchemaType.JSON);
Schema.Parser parser = new Schema.Parser();
String schemaJson = new String(jsonSchema.getSchemaInfo().getSchema());
+ log.info("schemaJson: {}", schemaJson);
Assert.assertEquals(schemaJson, SCHEMA_JSON);
Schema schema = parser.parse(schemaJson);
@@ -54,10 +58,14 @@ public void testSchema() {
public void testEncodeAndDecode() {
JSONSchema<Foo> jsonSchema = JSONSchema.of(Foo.class, null);
+ Bar bar = new Bar();
+ bar.setField1(true);
+
Foo foo1 = new Foo();
foo1.setField1("foo1");
foo1.setField2("bar1");
- foo1.setField4(new Bar());
+ foo1.setField4(bar);
+ foo1.setColor(SchemaTestUtils.Color.BLUE);
Foo foo2 = new Foo();
foo2.setField1("foo2");
@@ -75,4 +83,55 @@ public void testEncodeAndDecode() {
Assert.assertEquals(object1, foo1);
Assert.assertEquals(object2, foo2);
}
+
+ @Test
+ public void testCorrectPolymorphism() {
+
+ Bar bar = new Bar();
+ bar.setField1(true);
+
+ DerivedFoo derivedFoo = new DerivedFoo();
+ derivedFoo.setField1("foo1");
+ derivedFoo.setField2("bar2");
+ derivedFoo.setField3(4);
+ derivedFoo.setField4(bar);
+ derivedFoo.setField5("derived1");
+ derivedFoo.setField6(2);
+
+ Foo foo = new Foo();
+ foo.setField1("foo1");
+ foo.setField2("bar2");
+ foo.setField3(4);
+ foo.setField4(bar);
+
+ SchemaTestUtils.DerivedDerivedFoo derivedDerivedFoo = new SchemaTestUtils.DerivedDerivedFoo();
+ derivedDerivedFoo.setField1("foo1");
+ derivedDerivedFoo.setField2("bar2");
+ derivedDerivedFoo.setField3(4);
+ derivedDerivedFoo.setField4(bar);
+ derivedDerivedFoo.setField5("derived1");
+ derivedDerivedFoo.setField6(2);
+ derivedDerivedFoo.setFoo2(foo);
+ derivedDerivedFoo.setDerivedFoo(derivedFoo);
+
+ // schema for base class
+ JSONSchema<Foo> baseJsonSchema = JSONSchema.of(Foo.class);
+ Assert.assertEquals(baseJsonSchema.decode(baseJsonSchema.encode(foo)), foo);
+ Assert.assertEquals(baseJsonSchema.decode(baseJsonSchema.encode(derivedFoo)), foo);
+ Assert.assertEquals(baseJsonSchema.decode(baseJsonSchema.encode(derivedDerivedFoo)), foo);
+
+ // schema for derived class
+ JSONSchema<DerivedFoo> derivedJsonSchema = JSONSchema.of(DerivedFoo.class);
+ Assert.assertEquals(derivedJsonSchema.decode(derivedJsonSchema.encode(derivedFoo)), derivedFoo);
+ log.info("derivedJsonSchema.encode(derivedDerivedFoo)): {}", derivedJsonSchema.decode(derivedJsonSchema.encode(derivedDerivedFoo)));
+ Assert.assertEquals(derivedJsonSchema.decode(derivedJsonSchema.encode(derivedDerivedFoo)), derivedFoo);
+
+ //schema for derived derived class
+ JSONSchema<SchemaTestUtils.DerivedDerivedFoo> derivedDerivedJsonSchema
+ = JSONSchema.of(SchemaTestUtils.DerivedDerivedFoo.class);
+ Assert.assertEquals(derivedDerivedJsonSchema.decode(derivedDerivedJsonSchema.encode(derivedDerivedFoo)), derivedDerivedFoo);
+
+
+
+ }
}
diff --git a/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/SchemaTestUtils.java b/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/SchemaTestUtils.java
index 52d80eb9a6..123b81c82c 100644
--- a/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/SchemaTestUtils.java
+++ b/pulsar-client-schema/src/test/java/org/apache/pulsar/client/schema/SchemaTestUtils.java
@@ -35,6 +35,7 @@
private String field2;
private int field3;
private Bar field4;
+ private Color color;
}
@Data
@@ -44,18 +45,45 @@
private boolean field1;
}
- public static final String SCHEMA_JSON = "{\"type\":\"record\",\"name\":\"Foo\",\"namespace\":\"org.apache" +
- ".pulsar.client" +
- ".schema.SchemaTestUtils$\",\"fields\":[{\"name\":\"field1\",\"type\":[\"null\",\"string\"]," +
- "\"default\":null},{\"name\":\"field2\",\"type\":[\"null\",\"string\"],\"default\":null}," +
- "{\"name\":\"field3\",\"type\":\"int\"},{\"name\":\"field4\",\"type\":[\"null\",{\"type\":\"record\"," +
- "\"name\":\"Bar\",\"fields\":[{\"name\":\"field1\",\"type\":\"boolean\"}]}],\"default\":null}]}";
+ @Data
+ @ToString
+ @EqualsAndHashCode
+ public static class DerivedFoo extends Foo {
+ private String field5;
+ private int field6;
+ private Foo foo;
+ }
+
+ public enum Color {
+ RED,
+ BLUE
+ }
+
+ @Data
+ @ToString
+ @EqualsAndHashCode
+ public static class DerivedDerivedFoo extends DerivedFoo {
+ private String field7;
+ private int field8;
+ private DerivedFoo derivedFoo;
+ private Foo foo2;
+ }
+
+ public static final String SCHEMA_JSON
+ = "{\"type\":\"record\",\"name\":\"Foo\",\"namespace\":\"org.apache.pulsar.client.schema" +
+ ".SchemaTestUtils$\",\"fields\":[{\"name\":\"field1\",\"type\":[\"null\",\"string\"],\"default\":null}," +
+ "{\"name\":\"field2\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"field3\"," +
+ "\"type\":\"int\"},{\"name\":\"field4\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"Bar\"," +
+ "\"fields\":[{\"name\":\"field1\",\"type\":\"boolean\"}]}],\"default\":null},{\"name\":\"color\"," +
+ "\"type\":[\"null\",{\"type\":\"enum\",\"name\":\"Color\",\"symbols\":[\"RED\",\"BLUE\"]}]," +
+ "\"default\":null}]}";
public static String[] FOO_FIELDS = {
"field1",
"field2",
"field3",
- "field4"
+ "field4",
+ "color"
};
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services