diff --git a/LICENSE-binary b/LICENSE-binary index dbe8c9ec046..f2387a5cc53 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -223,7 +223,7 @@ jackson-dataformat-csv-2.16.2 jackson-datatype-jdk8-2.16.2 jackson-jaxrs-base-2.16.2 jackson-jaxrs-json-provider-2.16.2 -jackson-module-afterburner-2.16.2 +jackson-module-blackbird-2.16.2 jackson-module-jaxb-annotations-2.16.2 jackson-module-scala_2.13-2.16.2 jakarta.validation-api-2.0.2 diff --git a/build.gradle b/build.gradle index 4c67ec95119..7e20f823f2b 100644 --- a/build.gradle +++ b/build.gradle @@ -3439,7 +3439,7 @@ project(':connect:json') { api libs.jacksonDatabind api libs.jacksonJDK8Datatypes - api libs.jacksonAfterburner + api libs.jacksonBlackbird implementation libs.slf4jApi runtimeOnly libs.reload4j 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 ba4aab5f836..a7abef315c5 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 enableAfterburner permits to enable/disable the registration of Jackson Afterburner module. + * @param enableBlackbird permits to enable/disable the registration of Jackson Blackbird module. *

* NOTE: This is visible only for testing */ - public JsonConverter(boolean enableAfterburner) { + public JsonConverter(boolean enableBlackbird) { serializer = new JsonSerializer( Set.of(), JSON_NODE_FACTORY, - enableAfterburner + enableBlackbird ); deserializer = new JsonDeserializer( @@ -259,7 +259,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned { DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS ), JSON_NODE_FACTORY, - enableAfterburner + enableBlackbird ); } 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 40d4631dfb9..775768f37d3 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 @@ -24,7 +24,7 @@ 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 com.fasterxml.jackson.module.afterburner.AfterburnerModule; +import com.fasterxml.jackson.module.blackbird.BlackbirdModule; import java.util.Collections; import java.util.Set; @@ -53,13 +53,13 @@ public class JsonDeserializer implements Deserializer { JsonDeserializer( final Set deserializationFeatures, final JsonNodeFactory jsonNodeFactory, - final boolean enableAfterburner + final boolean enableBlackbird ) { objectMapper.enable(JsonReadFeature.ALLOW_LEADING_ZEROS_FOR_NUMBERS.mappedFeature()); deserializationFeatures.forEach(objectMapper::enable); objectMapper.setNodeFactory(jsonNodeFactory); - if (enableAfterburner) { - objectMapper.registerModule(new AfterburnerModule()); + if (enableBlackbird) { + objectMapper.registerModule(new BlackbirdModule()); } } 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 64c44141488..e40f530469a 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 @@ -23,7 +23,7 @@ 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 com.fasterxml.jackson.module.afterburner.AfterburnerModule; +import com.fasterxml.jackson.module.blackbird.BlackbirdModule; import java.util.Collections; import java.util.Set; @@ -52,12 +52,12 @@ public class JsonSerializer implements Serializer { JsonSerializer( final Set serializationFeatures, final JsonNodeFactory jsonNodeFactory, - final boolean enableAfterburner + final boolean enableBlackbird ) { serializationFeatures.forEach(objectMapper::enable); objectMapper.setNodeFactory(jsonNodeFactory); - if (enableAfterburner) { - objectMapper.registerModule(new AfterburnerModule()); + if (enableBlackbird) { + objectMapper.registerModule(new BlackbirdModule()); } } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 27c69c90037..cde22a4050b 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -161,7 +161,7 @@ libs += [ jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson", jacksonModuleScala: "com.fasterxml.jackson.module:jackson-module-scala_$versions.baseScala:$versions.jackson", jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson", - jacksonAfterburner: "com.fasterxml.jackson.module:jackson-module-afterburner:$versions.jackson", + jacksonBlackbird: "com.fasterxml.jackson.module:jackson-module-blackbird:$versions.jackson", jacksonJaxrsJsonProvider: "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$versions.jackson", jaxAnnotationApi: "javax.annotation:javax.annotation-api:$versions.jaxAnnotation", jaxbApi: "javax.xml.bind:jaxb-api:$versions.jaxb", diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/connect/JsonConverterBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/connect/JsonConverterBenchmark.java index aa45a7e711b..35998a70ef0 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/connect/JsonConverterBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/connect/JsonConverterBenchmark.java @@ -51,7 +51,7 @@ public class JsonConverterBenchmark { private JsonConverter converter; @Param({"true", "false"}) - private boolean afterBurnModule; + private boolean blackbirdModule; @State(Scope.Benchmark) public static class Data { @@ -425,7 +425,7 @@ public class JsonConverterBenchmark { @Setup(Level.Trial) public void setup(BenchmarkParams params) { - converter = new JsonConverter(Boolean.parseBoolean(params.getParam("afterBurnModule"))); + converter = new JsonConverter(Boolean.parseBoolean(params.getParam("blackbirdModule"))); converter.configure(Collections.emptyMap(), false); }