DGS-9343 Allow removing enum in JSON Schema to be backward compatible

confluentinc · Dec 5, 2023 · bafbad8 · bafbad8
1 parent 3e6f1c0
commit bafbad8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 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
@@ -161,6 +161,16 @@ static void compare(final Context ctx, Schema original, Schema update) {
           ctx.addDifferences(subctx.getDifferences());
           return;
         }
+      } else if (combinedSchema.getCriterion() == CombinedSchema.ALL_CRITERION) {
+        for (Schema subschema : combinedSchema.getSubschemas()) {
+          final Context subctx = ctx.getSubcontext();
+          compare(subctx, subschema, update);
+          if (subctx.isCompatible()) {
+            ctx.addDifferences(subctx.getDifferences());
+            ctx.addDifference(Type.PRODUCT_TYPE_NARROWED);
+            return;
+          }
+        }
       }
     }
 

diff --git a/json-schema-provider/src/test/resources/diff-schema-examples.json b/json-schema-provider/src/test/resources/diff-schema-examples.json
@@ -349,6 +349,22 @@
     ],
     "compatible": false
   },
+  {
+    "description": "Detect removed enum ",
+    "original_schema": {
+      "type": "string",
+      "enum": [
+        "red"
+      ]
+    },
+    "update_schema": {
+      "type": "string"
+    },
+    "changes": [
+      "PRODUCT_TYPE_NARROWED #/"
+    ],
+    "compatible": true
+  },
   {
     "description": "Detect incompatible changes to enum schema",
     "original_schema": {