You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jl...@apache.org on 2024/07/11 12:26:00 UTC
(kafka) branch 3.8 updated: KAFKA-17111: explicitly register Afterburner module in JsonSerializer and JsonDeserializer (#16565)
This is an automated email from the ASF dual-hosted git repository.
jlprat pushed a commit to branch 3.8
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.8 by this push:
new 1d803c4d9f3 KAFKA-17111: explicitly register Afterburner module in JsonSerializer and JsonDeserializer (#16565)
1d803c4d9f3 is described below
commit 1d803c4d9f3d4e62140b4ad00ffe0bdddf30370f
Author: Vikas Balani <12...@users.noreply.github.com>
AuthorDate: Thu Jul 11 17:47:27 2024 +0530
KAFKA-17111: explicitly register Afterburner module in JsonSerializer and JsonDeserializer (#16565)
Reviewers: Mickael Maison <mi...@gmail.com>, Josep Prat <jo...@aiven.io>, Greg Harris <gr...@aiven.io>
---
.../java/org/apache/kafka/connect/json/JsonConverter.java | 8 ++++----
.../java/org/apache/kafka/connect/json/JsonDeserializer.java | 12 +++++++-----
.../java/org/apache/kafka/connect/json/JsonSerializer.java | 12 +++++++-----
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
index b623aaf14e8..b77eeaf0662 100644
--- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
+++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
@@ -241,15 +241,15 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned {
/**
* Creates a JsonConvert initializing serializer and deserializer.
*
- * @param enableModules permits to enable/disable the registration of additional Jackson modules.
+ * @param enableAfterburner permits to enable/disable the registration of Jackson Afterburner module.
* <p>
* NOTE: This is visible only for testing
*/
- public JsonConverter(boolean enableModules) {
+ public JsonConverter(boolean enableAfterburner) {
serializer = new JsonSerializer(
mkSet(),
JSON_NODE_FACTORY,
- enableModules
+ enableAfterburner
);
deserializer = new JsonDeserializer(
@@ -259,7 +259,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned {
DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS
),
JSON_NODE_FACTORY,
- enableModules
+ enableAfterburner
);
}
diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java
index d63ae7808c3..40d4631dfb9 100644
--- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java
+++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java
@@ -16,13 +16,15 @@
*/
package org.apache.kafka.connect.json;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Deserializer;
+
import com.fasterxml.jackson.core.json.JsonReadFeature;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import org.apache.kafka.common.errors.SerializationException;
-import org.apache.kafka.common.serialization.Deserializer;
+import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import java.util.Collections;
import java.util.Set;
@@ -51,13 +53,13 @@ public class JsonDeserializer implements Deserializer<JsonNode> {
JsonDeserializer(
final Set<DeserializationFeature> deserializationFeatures,
final JsonNodeFactory jsonNodeFactory,
- final boolean enableModules
+ final boolean enableAfterburner
) {
objectMapper.enable(JsonReadFeature.ALLOW_LEADING_ZEROS_FOR_NUMBERS.mappedFeature());
deserializationFeatures.forEach(objectMapper::enable);
objectMapper.setNodeFactory(jsonNodeFactory);
- if (enableModules) {
- objectMapper.findAndRegisterModules();
+ if (enableAfterburner) {
+ objectMapper.registerModule(new AfterburnerModule());
}
}
diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java
index f8b13fbb6a9..64c44141488 100644
--- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java
+++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java
@@ -16,12 +16,14 @@
*/
package org.apache.kafka.connect.json;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Serializer;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import org.apache.kafka.common.errors.SerializationException;
-import org.apache.kafka.common.serialization.Serializer;
+import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import java.util.Collections;
import java.util.Set;
@@ -50,12 +52,12 @@ public class JsonSerializer implements Serializer<JsonNode> {
JsonSerializer(
final Set<SerializationFeature> serializationFeatures,
final JsonNodeFactory jsonNodeFactory,
- final boolean enableModules
+ final boolean enableAfterburner
) {
serializationFeatures.forEach(objectMapper::enable);
objectMapper.setNodeFactory(jsonNodeFactory);
- if (enableModules) {
- objectMapper.findAndRegisterModules();
+ if (enableAfterburner) {
+ objectMapper.registerModule(new AfterburnerModule());
}
}