Merge pull request #760 from commercetools/SUPPORT-29621-jackson-2-18…

…-fix [SUPPORT-29621] fix regression with jackson 2.18.x
commercetools · Nov 20, 2024 · b8a9fcf · b8a9fcf
2 parents b98089c + e7f2827
commit b8a9fcf
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 79 deletions.
diff --git a/build.gradle b/build.gradle
@@ -116,6 +116,11 @@ subprojects { project ->
             languageVersion = JavaLanguageVersion.of(17)
         }
     }
+    compileIntegrationTestJava {
+        javaCompiler = javaToolchains.compilerFor {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
     compileTestJava {
         javaCompiler = javaToolchains.compilerFor {
             languageVersion = JavaLanguageVersion.of(17)

diff --git a/...s-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java b/...s-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java
@@ -4,6 +4,7 @@
 import java.time.*;
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.*;
@@ -23,7 +24,7 @@ public class LocalizedStringImpl implements LocalizedString, ModelBase {
     private Map<String, String> values;
 
     @JsonCreator
-    LocalizedStringImpl(@JsonProperty("values") final Map<String, String> values) {
+    LocalizedStringImpl(@JsonAnySetter @JsonProperty("values") final Map<String, String> values) {
         this.values = values;
     }
 

diff --git a/...tools/commercetools-sdk-java-api/src/test/java/com/commercetools/LocalizedStringTest.java b/...tools/commercetools-sdk-java-api/src/test/java/com/commercetools/LocalizedStringTest.java
@@ -1,6 +1,7 @@
 
 package com.commercetools;
 
+import static com.commercetools.TestUtils.stringFromResource;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -12,6 +13,7 @@
 
 import com.commercetools.api.models.common.LocalizedString;
 import com.commercetools.api.models.common.LocalizedStringEntry;
+import com.commercetools.api.models.product.ProductData;
 
 import io.vrap.rmf.base.client.utils.json.JsonUtils;
 
@@ -370,4 +372,12 @@ public void ofStringToStringMap() {
                 .plus(Locale.ITALIAN, "Giacche");
         assertThat(actual).isEqualTo(expected);
     }
+
+    public static final String DEFAULT_LOCALE = "en-US";
+
+    @Test
+    public void getLocale() {
+        ProductData p = JsonUtils.fromJsonString(stringFromResource("product-data.json"), ProductData.class);
+        assertThat(p.getName().get(DEFAULT_LOCALE)).isEqualTo("Hoodie");
+    }
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/resources/product-data.json b/commercetools/commercetools-sdk-java-api/src/test/resources/product-data.json
@@ -0,0 +1,5 @@
+{
+    "name": {
+        "en-US": "Hoodie"
+    }
+}
diff --git a/gradle-scripts/extensions.gradle b/gradle-scripts/extensions.gradle
@@ -31,10 +31,10 @@ ext {
     ]
 
     jackson_core = [
-            annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.17.1',
-            databind: 'com.fasterxml.jackson.core:jackson-databind:2.17.1',
-            core: 'com.fasterxml.jackson.core:jackson-core:2.17.1',
-            datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1',
+            annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.18.1',
+            databind: 'com.fasterxml.jackson.core:jackson-databind:2.18.1',
+            core: 'com.fasterxml.jackson.core:jackson-core:2.18.1',
+            datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1',
     ]
 
     google = [

diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],

diff --git a/licenses/commercetools-async-http-client/index.json b/licenses/commercetools-async-http-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],

diff --git a/licenses/commercetools-graphql-api/index.json b/licenses/commercetools-graphql-api/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],

diff --git a/licenses/commercetools-http-client/index.json b/licenses/commercetools-http-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],

diff --git a/licenses/commercetools-javanet-client/index.json b/licenses/commercetools-javanet-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],

diff --git a/licenses/commercetools-monitoring-datadog/index.json b/licenses/commercetools-monitoring-datadog/index.json
@@ -32,7 +32,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -45,7 +45,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -58,7 +58,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -71,7 +71,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -84,7 +84,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-base"
             ],

diff --git a/licenses/commercetools-monitoring-newrelic/index.json b/licenses/commercetools-monitoring-newrelic/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],

diff --git a/licenses/commercetools-monitoring-opentelemetry/index.json b/licenses/commercetools-monitoring-opentelemetry/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.17.1",
+            "moduleVersion": "2.18.1",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],