Skip to content

KAFKA-15208: Upgrade Jackson dependencies to version 2.16.0 #13662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 19, 2023
Merged

KAFKA-15208: Upgrade Jackson dependencies to version 2.16.0 #13662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6fac0d1
upgrade jackson version to 2.15.0
bmscomp May 2, 2023
982aa09
remove deprecated call of JsonNodeFactory.withExactBigDecimals
bmscomp May 2, 2023
ebc9f4e
remove deprected call and fix typos in comments documentation
bmscomp May 2, 2023
2ac684f
raise version of jackson to latest stable one 1.15.2
bmscomp Jul 16, 2023
9410a6a
update the license file
bmscomp Jul 16, 2023
562e007
update version of jackson databind to 2.15.3
bmscomp Oct 13, 2023
aaeed4f
update licence file
bmscomp Oct 13, 2023
cad22f6
restore fixes related to javadoc
bmscomp Dec 6, 2023
e5df166
keep a clean pull request related to jackson upgrade
bmscomp Dec 6, 2023
3c7b4de
restore fixed typos
bmscomp Dec 6, 2023
5247cda
upgrade jackson to version 2.16.0
bmscomp Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,16 @@ commons-lang3-3.8.1
commons-logging-1.2
commons-validator-1.7
error_prone_annotations-2.10.0
jackson-annotations-2.13.5
jackson-core-2.13.5
jackson-databind-2.13.5
jackson-dataformat-csv-2.13.5
jackson-datatype-jdk8-2.13.5
jackson-jaxrs-base-2.13.5
jackson-jaxrs-json-provider-2.13.5
jackson-module-jaxb-annotations-2.13.5
jackson-module-scala_2.13-2.13.5
jackson-module-scala_2.12-2.13.5
jackson-annotations-2.16.0
jackson-core-2.16.0
jackson-databind-2.16.0
jackson-dataformat-csv-2.16.0
jackson-datatype-jdk8-2.16.0
jackson-jaxrs-base-2.16.0
jackson-jaxrs-json-provider-2.16.0
jackson-module-jaxb-annotations-2.16.0
jackson-module-scala_2.13-2.16.0
jackson-module-scala_2.12-2.16.0
jakarta.validation-api-2.0.2
javassist-3.29.2-GA
jetty-client-9.4.53.v20231009
Expand Down
2 changes: 1 addition & 1 deletion connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned {
// names specified in the field
private static final HashMap<String, LogicalTypeConverter> LOGICAL_CONVERTERS = new HashMap<>();

private static final JsonNodeFactory JSON_NODE_FACTORY = JsonNodeFactory.withExactBigDecimals(true);
private static final JsonNodeFactory JSON_NODE_FACTORY = new JsonNodeFactory(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify why we're making this changes?

Copy link
Contributor Author

@bmscomp bmscomp Dec 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mimaison Sorry I missed answering this point, the change is made because the static method is deprecated

    /**
     * Return a factory instance with the desired behavior for BigDecimals
     * <p>See {@link #JsonNodeFactory(boolean)} for a full description.</p>
     *
     * @param bigDecimalExact If {code true} DISABLE normalization of {@link BigDecimal} values;
     *    if {code false} ENABLE normalization
     * @return a factory instance with specified configuration
     *
     * @deprecated Use {@link com.fasterxml.jackson.databind.cfg.JsonNodeFeature#STRIP_TRAILING_BIGDECIMAL_ZEROES}
     *   instead for configuring behavior.
     */
    @Deprecated
    public static JsonNodeFactory withExactBigDecimals(boolean bigDecimalExact)
    {
        return new JsonNodeFactory(bigDecimalExact);
    }

and the best available replacement for it is the the constructor

    /**
     * @param bigDecimalExact see Class description on "BigDecimal normalization"
     *
     * @see BigDecimal
     */
    public JsonNodeFactory(boolean bigDecimalExact)
    {
        _cfgBigDecimalExact = bigDecimalExact;
    }


static {
LOGICAL_CONVERTERS.put(Decimal.LOGICAL_NAME, new LogicalTypeConverter() {
Expand Down
2 changes: 1 addition & 1 deletion connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class JsonDeserializer implements Deserializer<JsonNode> {
* Default constructor needed by Kafka
*/
public JsonDeserializer() {
this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true));
this(Collections.emptySet(), new JsonNodeFactory(true));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class JsonSerializer implements Serializer<JsonNode> {
* Default constructor needed by Kafka
*/
public JsonSerializer() {
this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true));
this(Collections.emptySet(), new JsonNodeFactory(true));
}

/**
Expand Down
5 changes: 3 additions & 2 deletions connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TimeZone;

Expand All @@ -65,7 +66,7 @@ public class JsonConverterTest {

private final ObjectMapper objectMapper = new ObjectMapper()
.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
.setNodeFactory(JsonNodeFactory.withExactBigDecimals(true));
.setNodeFactory(new JsonNodeFactory(true));

private final JsonConverter converter = new JsonConverter();

Expand Down Expand Up @@ -869,7 +870,7 @@ public void testCacheSchemaToJsonConversion() {

@Test
public void testJsonSchemaCacheSizeFromConfigFile() throws URISyntaxException, IOException {
URL url = getClass().getResource("/connect-test.properties");
URL url = Objects.requireNonNull(getClass().getResource("/connect-test.properties"));
File propFile = new File(url.toURI());
String workerPropsFile = propFile.getAbsolutePath();
Map<String, String> workerProps = !workerPropsFile.isEmpty() ?
Expand Down
5 changes: 2 additions & 3 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ versions += [
gradle: "8.5",
grgit: "4.1.1",
httpclient: "4.5.14",
jackson: "2.13.5",
jacksonDatabind: "2.13.5",
jackson: "2.16.0",
jacoco: "0.8.10",
javassist: "3.29.2-GA",
jetty: "9.4.53.v20231009",
Expand Down Expand Up @@ -186,7 +185,7 @@ libs += [
commonsValidator: "commons-validator:commons-validator:$versions.commonsValidator",
easymock: "org.easymock:easymock:$easymockVersion",
jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson",
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jacksonDatabind",
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
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",
Expand Down