Merge branch '6.0.x' into 6.1.x

confluentinc · Mar 8, 2021 · 1206f43 · 1206f43
2 parents c6cbb59 + e7352c3
commit 1206f43
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/...schema-provider/src/main/java/io/confluent/kafka/schemaregistry/json/diff/SchemaDiff.java b/...schema-provider/src/main/java/io/confluent/kafka/schemaregistry/json/diff/SchemaDiff.java
@@ -19,6 +19,7 @@
 import org.everit.json.schema.CombinedSchema;
 import org.everit.json.schema.EmptySchema;
 import org.everit.json.schema.EnumSchema;
+import org.everit.json.schema.FalseSchema;
 import org.everit.json.schema.NotSchema;
 import org.everit.json.schema.NumberSchema;
 import org.everit.json.schema.ObjectSchema;
@@ -158,8 +159,13 @@ static void compare(final Context ctx, Schema original, Schema update) {
     }
 
     if (!original.getClass().equals(update.getClass())) {
-      ctx.addDifference(Type.TYPE_CHANGED);
-      return;
+      // TrueSchema extends EmptySchema
+      if (original instanceof FalseSchema || update instanceof EmptySchema) {
+        return;
+      } else {
+        ctx.addDifference(Type.TYPE_CHANGED);
+        return;
+      }
     }
 
     try (Context.SchemaScope schemaScope = ctx.enterSchema(original)) {
@@ -197,13 +203,7 @@ static void compare(final Context ctx, Schema original, Schema update) {
   }
 
   private static Schema normalizeSchema(final Schema schema) {
-    if (schema instanceof EmptySchema) {
-      return ObjectSchema.builder()
-          .id(schema.getId())
-          .title(schema.getTitle())
-          .description(schema.getDescription())
-          .build();
-    } else if (schema instanceof ReferenceSchema) {
+    if (schema instanceof ReferenceSchema) {
       return ((ReferenceSchema) schema).getReferredSchema();
     } else {
       return schema;

diff --git a/...ma-provider/src/test/java/io/confluent/kafka/schemaregistry/json/diff/SchemaDiffTest.java b/...ma-provider/src/test/java/io/confluent/kafka/schemaregistry/json/diff/SchemaDiffTest.java
@@ -88,7 +88,8 @@ public void testSchemaAddsProperties() {
 
     final Schema second = SchemaLoader.load(new JSONObject(("{\"properties\": {}}")));
     final List<Difference> changes = SchemaDiff.compare(first, second);
-    Assert.assertTrue(changes.isEmpty());
+    // Changing from empty schema to empty object schema is incompatible
+    Assert.assertFalse(changes.isEmpty());
   }
 
   public static String readFile(String fileName) {

diff --git a/json-schema-provider/src/test/resources/diff-schema-examples.json b/json-schema-provider/src/test/resources/diff-schema-examples.json
@@ -1,4 +1,16 @@
 [
+  {
+    "description": "Anything can change to empty schema",
+    "original_schema": {
+      "properties": {
+      }
+    },
+    "update_schema": {
+    },
+    "changes": [
+    ],
+    "compatible": true
+  },
   {
     "description": "Detect changes to id",
     "original_schema": {
@@ -952,6 +964,8 @@
       }
     },
     "update_schema": {
+      "dependencies": {
+      }
     },
     "changes": [
       "DEPENDENCY_SCHEMA_REMOVED #/dependencies/foo"
@@ -1079,9 +1093,13 @@
   {
     "description": "Detect removed maxProperties",
     "original_schema": {
+      "properties": {
+      },
       "maxProperties": 1
     },
     "update_schema": {
+      "properties": {
+      }
     },
     "changes": [
       "MAX_PROPERTIES_REMOVED #/maxProperties"
@@ -1117,9 +1135,13 @@
   {
     "description": "Detect removed minProperties",
     "original_schema": {
+      "properties": {
+      },
       "minProperties": 2
     },
     "update_schema": {
+      "properties": {
+      }
     },
     "changes": [
       "MIN_PROPERTIES_REMOVED #/minProperties"
@@ -1524,9 +1546,13 @@
   {
     "description": "Detect added boolean additional properties",
     "original_schema": {
+      "properties": {
+      },
       "additionalProperties": false
     },
     "update_schema": {
+      "properties": {
+      }
     },
     "changes": [
       "ADDITIONAL_PROPERTIES_ADDED #/additionalProperties"