Merge pull request #3152 from confluentinc/pr_merge_from_7_3_x_to_7_4_x

Merge Conflict Resolution (from 7.3.x to 7.4.x)
confluentinc · Jun 11, 2024 · e4a78b1 · e4a78b1
2 parents c4b7f13 + 28acd84
commit e4a78b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...rc/main/java/io/confluent/kafka/serializers/json/AbstractKafkaJsonSchemaDeserializer.java b/...rc/main/java/io/confluent/kafka/serializers/json/AbstractKafkaJsonSchemaDeserializer.java
@@ -49,7 +49,7 @@
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDe;
 
 public abstract class AbstractKafkaJsonSchemaDeserializer<T> extends AbstractKafkaSchemaSerDe {
-  protected static final ObjectMapper objectMapper = Jackson.newObjectMapper();
+  protected ObjectMapper objectMapper = Jackson.newObjectMapper();
   protected Class<T> type;
   protected String typeProperty;
   protected boolean validate;

diff --git a/.../src/main/java/io/confluent/kafka/serializers/json/AbstractKafkaJsonSchemaSerializer.java b/.../src/main/java/io/confluent/kafka/serializers/json/AbstractKafkaJsonSchemaSerializer.java
@@ -50,7 +50,7 @@ public abstract class AbstractKafkaJsonSchemaSerializer<T> extends AbstractKafka
   protected int useSchemaId = -1;
   protected boolean idCompatStrict;
   protected boolean latestCompatStrict;
-  protected static final ObjectMapper objectMapper = Jackson.newObjectMapper();
+  protected ObjectMapper objectMapper = Jackson.newObjectMapper();
   protected SpecificationVersion specVersion;
   protected boolean oneofForNullables;
   protected boolean failUnknownProperties;