DGS-7446 Fix perf regression due to DGS-6331 (#2693)

confluentinc · Jul 8, 2023 · 095f6cd · 095f6cd
1 parent ca004d0
commit 095f6cd
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
@@ -222,6 +222,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
@@ -138,7 +138,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);
           }