Merge branch '7.0.x' into 7.1.x

confluentinc · Jul 8, 2023 · 41691a2 · 41691a2
2 parents 49f93a4 + ba05131
commit 41691a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/json-schema-provider/src/main/java/io/confluent/kafka/schemaregistry/json/JsonSchema.java b/json-schema-provider/src/main/java/io/confluent/kafka/schemaregistry/json/JsonSchema.java
@@ -224,6 +224,10 @@ public String name() {
     return getString("title");
   }
 
+  public boolean has(String key) {
+    return jsonNode.has(key);
+  }
+
   public String getString(String key) {
     return jsonNode.has(key) ? jsonNode.get(key).asText() : null;
   }

diff --git a/...rc/main/java/io/confluent/kafka/serializers/json/AbstractKafkaJsonSchemaDeserializer.java b/...rc/main/java/io/confluent/kafka/serializers/json/AbstractKafkaJsonSchemaDeserializer.java
@@ -146,7 +146,7 @@ protected Object deserialize(
             : objectMapper.readValue(buffer.array(), start, length, type);
       } else {
         String typeName;
-        if (schema.rawSchema() instanceof CombinedSchema) {
+        if (schema.has("oneOf") || schema.has("anyOf") || schema.has("allOf")) {
           if (jsonNode == null) {
             jsonNode = objectMapper.readValue(buffer.array(), start, length, JsonNode.class);
           }