Merge pull request #746 from commercetools/fix-deserialize-subtypes

jenschude · web-flow · commit 0621fc2bb10f · 2024-10-18T09:38:37.000+02:00
Fix deserialization if subtype discriminator is missing
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CartDiscountTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CartDiscountTest.java
@@ -4,7 +4,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.commercetools.api.models.cart_discount.*;
+import com.commercetools.api.models.common.ReferenceTypeId;
 
+import io.vrap.rmf.base.client.utils.json.JsonUtils;
+
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class CartDiscountTest {
@@ -94,4 +98,17 @@ public void giftLineItemValueToDraft() {
             });
 
     }
+
+    @Test
+    public void deserializeGiftLineItemWithoutTypeId() {
+        String json = "{\"value\": { \"type\": \"giftLineItem\", \"product\": { \"id\": \"foo\" } } }";
+        CartDiscount cartDiscount = JsonUtils.fromJsonString(json, CartDiscount.class);
+        Assertions.assertThat(cartDiscount.getValue())
+                .isInstanceOfSatisfying(CartDiscountValueGiftLineItem.class, cartDiscountValueGiftLineItem -> {
+                    assertThat(cartDiscountValueGiftLineItem.getProduct().getId()).isEqualTo("foo");
+                    assertThat(cartDiscountValueGiftLineItem.getProduct().getTypeId())
+                            .isEqualTo(ReferenceTypeId.PRODUCT);
+                });
+        Assertions.assertThat(cartDiscount.getValue()).isInstanceOf(CartDiscountValueGiftLineItem.class);
+    }
 }
diff --git a/gradle-scripts/extensions.gradle b/gradle-scripts/extensions.gradle
@@ -5,7 +5,7 @@ ext {
             convenience: 'com.commercetools.sdk.jvm.core:commercetools-convenience:2.16.0',
             version: {
                 strictly '[1.62.0,)'
-                prefer '2.14.0'
+                prefer '2.16.0'
             }
     ]
 
diff --git a/licenses/commercetools-sdk-compat-v1/index.json b/licenses/commercetools-sdk-compat-v1/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -12,7 +12,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-ahc-2_0",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -22,7 +22,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-core",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -32,7 +32,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-models",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -42,7 +42,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-sdk-base",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -52,7 +52,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:sdk-http",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -62,7 +62,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:sdk-http-ahc-2_0",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
diff --git a/licenses/index.json b/licenses/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -12,7 +12,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-ahc-2_0",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -22,7 +22,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-core",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -32,7 +32,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-models",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -42,7 +42,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:commercetools-sdk-base",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -52,7 +52,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:sdk-http",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -62,7 +62,7 @@
         },
         {
             "moduleName": "com.commercetools.sdk.jvm.core:sdk-http-ahc-2_0",
-            "moduleVersion": "2.14.0",
+            "moduleVersion": "2.16.0",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/JsonUtils.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/utils/json/JsonUtils.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -52,17 +53,18 @@ public static ObjectMapper createObjectMapper(final ModuleOptions options) {
         final List<SimpleModule> moduleList = new ArrayList<>();
         suppliers.iterator().forEachRemaining(moduleSupplier -> moduleList.add(moduleSupplier.getModule(options)));
 
-        final ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule()) //provides serialization and deserialization for LocalDate and LocalTime (JSR310 Jackson module)
-                .registerModule(new ZonedDateTimeSerializationModule()) //custom serializer for LocalDate, LocalTime and ZonedDateTime
-                .registerModule(new ZonedDateTimeDeserializationModule()) //custom deserializer for ZonedDateTime
-                .registerModule(new LocalDateDeserializationModule()) //custom deserializer for LocalDate
-                .registerModules(loader)
-                .registerModules(moduleList)
-                .setSerializationInclusion(JsonInclude.Include.NON_NULL) //ignore null fields
+        return JsonMapper.builder()
+                .addModule(new JavaTimeModule()) //provides serialization and deserialization for LocalDate and LocalTime (JSR310 Jackson module)
+                .addModule(new ZonedDateTimeSerializationModule()) //custom serializer for LocalDate, LocalTime and ZonedDateTime
+                .addModule(new ZonedDateTimeDeserializationModule()) //custom deserializer for ZonedDateTime
+                .addModule(new LocalDateDeserializationModule()) //custom deserializer for LocalDate
+                .addModules(loader)
+                .addModules(moduleList)
+                .serializationInclusion(JsonInclude.Include.NON_NULL) //ignore null fields
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-        return objectMapper;
+                .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+                .configure(MapperFeature.REQUIRE_TYPE_ID_FOR_SUBTYPES, false)
+                .build();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ ext {`
`5`	`5`	`convenience: 'com.commercetools.sdk.jvm.core:commercetools-convenience:2.16.0',`
`6`	`6`	`version: {`
`7`	`7`	`strictly '[1.62.0,)'`
`8`		`- prefer '2.14.0'`
	`8`	`+ prefer '2.16.0'`
`9`	`9`	`}`
`10`	`10`	`]`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"dependencies": [`
`3`	`3`	`{`
`4`	`4`	`"moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client",`
`5`		`- "moduleVersion": "2.14.0",`
	`5`	`+ "moduleVersion": "2.16.0",`
`6`	`6`	`"moduleLicenses": [`
`7`	`7`	`{`
`8`	`8`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -12,7 +12,7 @@`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-ahc-2_0",`
`15`		`- "moduleVersion": "2.14.0",`
	`15`	`+ "moduleVersion": "2.16.0",`
`16`	`16`	`"moduleLicenses": [`
`17`	`17`	`{`
`18`	`18`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -22,7 +22,7 @@`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-core",`
`25`		`- "moduleVersion": "2.14.0",`
	`25`	`+ "moduleVersion": "2.16.0",`
`26`	`26`	`"moduleLicenses": [`
`27`	`27`	`{`
`28`	`28`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -32,7 +32,7 @@`
`32`	`32`	`},`
`33`	`33`	`{`
`34`	`34`	`"moduleName": "com.commercetools.sdk.jvm.core:commercetools-models",`
`35`		`- "moduleVersion": "2.14.0",`
	`35`	`+ "moduleVersion": "2.16.0",`
`36`	`36`	`"moduleLicenses": [`
`37`	`37`	`{`
`38`	`38`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -42,7 +42,7 @@`
`42`	`42`	`},`
`43`	`43`	`{`
`44`	`44`	`"moduleName": "com.commercetools.sdk.jvm.core:commercetools-sdk-base",`
`45`		`- "moduleVersion": "2.14.0",`
	`45`	`+ "moduleVersion": "2.16.0",`
`46`	`46`	`"moduleLicenses": [`
`47`	`47`	`{`
`48`	`48`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -52,7 +52,7 @@`
`52`	`52`	`},`
`53`	`53`	`{`
`54`	`54`	`"moduleName": "com.commercetools.sdk.jvm.core:sdk-http",`
`55`		`- "moduleVersion": "2.14.0",`
	`55`	`+ "moduleVersion": "2.16.0",`
`56`	`56`	`"moduleLicenses": [`
`57`	`57`	`{`
`58`	`58`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -62,7 +62,7 @@`
`62`	`62`	`},`
`63`	`63`	`{`
`64`	`64`	`"moduleName": "com.commercetools.sdk.jvm.core:sdk-http-ahc-2_0",`
`65`		`- "moduleVersion": "2.14.0",`
	`65`	`+ "moduleVersion": "2.16.0",`
`66`	`66`	`"moduleLicenses": [`
`67`	`67`	`{`
`68`	`68`	`"moduleLicense": "Apache License, Version 2.0",`