Merge branch 'main' into SUPPORT-29621-jackson-2-18-fix

commercetools · Nov 20, 2024 · e7f2827 · e7f2827
2 parents 3d059d3 + b98089c
commit e7f2827
Show file tree

Hide file tree

Showing 193 changed files with 1,534 additions and 431 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -4,3 +4,4 @@ a8ec45c8ea4ba559247b654d01b0d35b21a68865
 d0129c1095216d5c830900c8a6223ef5d4274de1
 4bc5c823b8ebf5a00491c7e63e1ea49d29bf5ee7
 352051999507bd78542e177d67ce1548a0752691
+bbe9f971763ca1b27687a6a51067a385a0d23b04
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,19 @@
 
+# 17.18.0 (2024-11-20)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/750
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/751
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/752
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/753
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/754
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/756
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/759
+* SUPPORT-28804 add custom deserializer for attrs in import api by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/748
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.17.0...17.18.0
+
 # 17.17.0 (2024-11-07)
 
 ## What's Changed

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The latest stable SDK release can be retrieved from [Maven Central](https://sear
 ```gradle
 ext {
     versions = [
-        commercetools: "17.17.0"
+        commercetools: "17.18.0"
     ]
 }
 
@@ -42,7 +42,7 @@ dependencies {
 
 ```maven
 <properties>
-    <commercetools.version>17.17.0</commercetools.version>
+    <commercetools.version>17.18.0</commercetools.version>
 </properties>
 <dependencies>
     <dependency>

diff --git a/changes.md b/changes.md
@@ -3,17 +3,7 @@
 <details>
 <summary>Changed Property(s)</summary>
 
-- :warning: changed property `line` of type `GraphQLErrorLocation` from type `integer` to `number`
-- :warning: changed property `column` of type `GraphQLErrorLocation` from type `integer` to `number`
 - :warning: changed property `totalPrice` of type `StagedOrder` from type `TypedMoney` to `CentPrecisionMoney`
 - :warning: changed property `totalPrice` of type `Order` from type `TypedMoney` to `CentPrecisionMoney`
 </details>
 
-
-<details>
-<summary>Added QueryParameter(s)</summary>
-
-- added query parameter `where` to method `get /{projectKey}/product-selections/key={key}/products`
-- added query parameter `where` to method `get /{projectKey}/product-selections/{ID}/products`
-</details>
-
diff --git a/...etools-sdk-java-api/src/integrationTest/java/cleanup/DeleteEverythingIntegrationTest.java b/...etools-sdk-java-api/src/integrationTest/java/cleanup/DeleteEverythingIntegrationTest.java
@@ -82,15 +82,15 @@ public void execute() {
         }
     }
 
-    private <TMethod extends SimplePagedQueryResourceRequest<TMethod, TResult, ?>, TResult extends ResourcePagedQueryResponse<TElement>, TElement extends DomainResource<TElement>> void deleteAllResources(
+    private static <TMethod extends SimplePagedQueryResourceRequest<TMethod, TResult, ?>, TResult extends ResourcePagedQueryResponse<TElement>, TElement extends DomainResource<TElement>> void deleteAllResources(
             SimplePagedQueryResourceRequest<TMethod, TResult, ?> request, Consumer<TElement> deleteFn) {
 
         QueryUtils.queryAll(request, list -> {
             list.forEach(deleteFn);
         }, 100).toCompletableFuture().join();
     }
 
-    private void checkDepends(Runnable block) {
+    public static void checkDepends(Runnable block) {
         assertEventually(Duration.ofSeconds(60), Duration.ofMillis(1000), block);
     }
 
@@ -212,7 +212,7 @@ private void deleteAllCategories() {
         } while (response.getResults().size() != 0);
     }
 
-    private void deleteAllCartDiscounts() {
+    public static void deleteAllCartDiscounts() {
         checkDepends(() -> Assertions.assertThat(
             CommercetoolsTestUtils.getProjectApiRoot().discountCodes().get().executeBlocking().getBody().getCount())
                 .isZero());

diff --git a/...pi/src/integrationTest/java/commercetools/cart_discount/CartDiscountIntegrationTests.java b/...pi/src/integrationTest/java/commercetools/cart_discount/CartDiscountIntegrationTests.java
@@ -1,6 +1,7 @@
 
 package commercetools.cart_discount;
 
+import static cleanup.DeleteEverythingIntegrationTest.deleteAllCartDiscounts;
 import static commercetools.cart_discount.CartDiscountFixtures.*;
 import static commercetools.type.TypeFixtures.getFieldName;
 
@@ -16,10 +17,18 @@
 import commercetools.utils.CommercetoolsTestUtils;
 
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 public class CartDiscountIntegrationTests {
 
+    @BeforeAll
+    @AfterAll
+    public static void deleteCartDiscounts() {
+        deleteAllCartDiscounts();
+    }
+
     @Test
     public void ref() {
         Optional<ReferenceTypeId> optional = ReferenceTypeId.findEnumViaJsonName("product-type");

diff --git a/...n/java-generated/com/commercetools/api/models/error/AnonymousIdAlreadyInUseErrorImpl.java b/...n/java-generated/com/commercetools/api/models/error/AnonymousIdAlreadyInUseErrorImpl.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.*;
@@ -34,7 +35,7 @@ public class AnonymousIdAlreadyInUseErrorImpl implements AnonymousIdAlreadyInUse
      */
     @JsonCreator
     AnonymousIdAlreadyInUseErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values) {
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values) {
         this.message = message;
         this.values = values;
         this.code = ANONYMOUS_ID_ALREADY_IN_USE;

diff --git a/...ava-generated/com/commercetools/api/models/error/AssociateMissingPermissionErrorImpl.java b/...ava-generated/com/commercetools/api/models/error/AssociateMissingPermissionErrorImpl.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.*;
@@ -41,7 +42,7 @@ public class AssociateMissingPermissionErrorImpl implements AssociateMissingPerm
      */
     @JsonCreator
     AssociateMissingPermissionErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("associate") final com.commercetools.api.models.customer.CustomerResourceIdentifier associate,
             @JsonProperty("businessUnit") final com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifier businessUnit,
             @JsonProperty("associateOnBehalf") final com.commercetools.api.models.customer.CustomerResourceIdentifier associateOnBehalf,

diff --git a/...nerated/com/commercetools/api/models/error/AttributeDefinitionAlreadyExistsErrorImpl.java b/...nerated/com/commercetools/api/models/error/AttributeDefinitionAlreadyExistsErrorImpl.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.*;
@@ -40,7 +41,7 @@ public class AttributeDefinitionAlreadyExistsErrorImpl implements AttributeDefin
      */
     @JsonCreator
     AttributeDefinitionAlreadyExistsErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("conflictingProductTypeId") final String conflictingProductTypeId,
             @JsonProperty("conflictingProductTypeName") final String conflictingProductTypeName,
             @JsonProperty("conflictingAttributeName") final String conflictingAttributeName) {

diff --git a/...enerated/com/commercetools/api/models/error/AttributeDefinitionTypeConflictErrorImpl.java b/...enerated/com/commercetools/api/models/error/AttributeDefinitionTypeConflictErrorImpl.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.*;
@@ -40,7 +41,7 @@ public class AttributeDefinitionTypeConflictErrorImpl implements AttributeDefini
      */
     @JsonCreator
     AttributeDefinitionTypeConflictErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("conflictingProductTypeId") final String conflictingProductTypeId,
             @JsonProperty("conflictingProductTypeName") final String conflictingProductTypeName,
             @JsonProperty("conflictingAttributeName") final String conflictingAttributeName) {

diff --git a/...java-generated/com/commercetools/api/models/error/AttributeNameDoesNotExistErrorImpl.java b/...java-generated/com/commercetools/api/models/error/AttributeNameDoesNotExistErrorImpl.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.*;
@@ -36,7 +37,7 @@ public class AttributeNameDoesNotExistErrorImpl implements AttributeNameDoesNotE
      */
     @JsonCreator
     AttributeNameDoesNotExistErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("invalidAttributeName") final String invalidAttributeName) {
         this.message = message;
         this.values = values;

diff --git a/...a-api/src/main/java-generated/com/commercetools/api/models/error/BadGatewayErrorImpl.java b/...a-api/src/main/java-generated/com/commercetools/api/models/error/BadGatewayErrorImpl.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.*;
@@ -34,7 +35,7 @@ public class BadGatewayErrorImpl implements BadGatewayError, ModelBase {
      */
     @JsonCreator
     BadGatewayErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values) {
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values) {
         this.message = message;
         this.values = values;
         this.code = BAD_GATEWAY;

diff --git a/...in/java-generated/com/commercetools/api/models/error/ConcurrentModificationErrorImpl.java b/...in/java-generated/com/commercetools/api/models/error/ConcurrentModificationErrorImpl.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.*;
@@ -35,7 +36,7 @@ public class ConcurrentModificationErrorImpl implements ConcurrentModificationEr
      */
     @JsonCreator
     ConcurrentModificationErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("currentVersion") final Long currentVersion) {
         this.message = message;
         this.values = values;

diff --git a/.../src/main/java-generated/com/commercetools/api/models/error/ContentTooLargeErrorImpl.java b/.../src/main/java-generated/com/commercetools/api/models/error/ContentTooLargeErrorImpl.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.*;
@@ -33,7 +34,7 @@ public class ContentTooLargeErrorImpl implements ContentTooLargeError, ModelBase
      */
     @JsonCreator
     ContentTooLargeErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values) {
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values) {
         this.message = message;
         this.values = values;
         this.code = CONTENT_TOO_LARGE;

diff --git a/...va-generated/com/commercetools/api/models/error/CountryNotConfiguredInStoreErrorImpl.java b/...va-generated/com/commercetools/api/models/error/CountryNotConfiguredInStoreErrorImpl.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.*;
@@ -46,7 +47,7 @@ public class CountryNotConfiguredInStoreErrorImpl implements CountryNotConfigure
      */
     @JsonCreator
     CountryNotConfiguredInStoreErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("storeCountries") final java.util.List<String> storeCountries,
             @JsonProperty("country") final String country) {
         this.message = message;

diff --git a/...java-generated/com/commercetools/api/models/error/DiscountCodeNonApplicableErrorImpl.java b/...java-generated/com/commercetools/api/models/error/DiscountCodeNonApplicableErrorImpl.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.*;
@@ -55,7 +56,7 @@ public class DiscountCodeNonApplicableErrorImpl implements DiscountCodeNonApplic
      */
     @JsonCreator
     DiscountCodeNonApplicableErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("discountCode") final String discountCode, @JsonProperty("reason") final String reason,
             @JsonProperty("discountCodeId") final String discountCodeId,
             @JsonProperty("validFrom") final java.time.ZonedDateTime validFrom,

diff --git a/...n/java-generated/com/commercetools/api/models/error/DuplicateAttributeValueErrorImpl.java b/...n/java-generated/com/commercetools/api/models/error/DuplicateAttributeValueErrorImpl.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.*;
@@ -35,7 +36,7 @@ public class DuplicateAttributeValueErrorImpl implements DuplicateAttributeValue
      */
     @JsonCreator
     DuplicateAttributeValueErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("attribute") final com.commercetools.api.models.product.Attribute attribute) {
         this.message = message;
         this.values = values;

diff --git a/.../java-generated/com/commercetools/api/models/error/DuplicateAttributeValuesErrorImpl.java b/.../java-generated/com/commercetools/api/models/error/DuplicateAttributeValuesErrorImpl.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.*;
@@ -35,7 +36,7 @@ public class DuplicateAttributeValuesErrorImpl implements DuplicateAttributeValu
      */
     @JsonCreator
     DuplicateAttributeValuesErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("attributes") final java.util.List<com.commercetools.api.models.product.Attribute> attributes) {
         this.message = message;
         this.values = values;

diff --git a/.../main/java-generated/com/commercetools/api/models/error/DuplicateEnumValuesErrorImpl.java b/.../main/java-generated/com/commercetools/api/models/error/DuplicateEnumValuesErrorImpl.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.*;
@@ -35,7 +36,7 @@ public class DuplicateEnumValuesErrorImpl implements DuplicateEnumValuesError, M
      */
     @JsonCreator
     DuplicateEnumValuesErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("duplicates") final java.util.List<String> duplicates) {
         this.message = message;
         this.values = values;

diff --git a/...i/src/main/java-generated/com/commercetools/api/models/error/DuplicateFieldErrorImpl.java b/...i/src/main/java-generated/com/commercetools/api/models/error/DuplicateFieldErrorImpl.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.*;
@@ -37,7 +38,7 @@ public class DuplicateFieldErrorImpl implements DuplicateFieldError, ModelBase {
      */
     @JsonCreator
     DuplicateFieldErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("field") final String field,
             @JsonProperty("duplicateValue") final java.lang.Object duplicateValue) {
         this.message = message;

diff --git a/...ed/com/commercetools/api/models/error/DuplicateFieldWithConflictingResourceErrorImpl.java b/...ed/com/commercetools/api/models/error/DuplicateFieldWithConflictingResourceErrorImpl.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.*;
@@ -40,7 +41,7 @@ public class DuplicateFieldWithConflictingResourceErrorImpl
      */
     @JsonCreator
     DuplicateFieldWithConflictingResourceErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("field") final String field,
             @JsonProperty("duplicateValue") final java.lang.Object duplicateValue,
             @JsonProperty("conflictingResource") final com.commercetools.api.models.common.Reference conflictingResource) {

diff --git a/...rc/main/java-generated/com/commercetools/api/models/error/DuplicatePriceKeyErrorImpl.java b/...rc/main/java-generated/com/commercetools/api/models/error/DuplicatePriceKeyErrorImpl.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.*;
@@ -36,7 +37,7 @@ public class DuplicatePriceKeyErrorImpl implements DuplicatePriceKeyError, Model
      */
     @JsonCreator
     DuplicatePriceKeyErrorImpl(@JsonProperty("message") final String message,
-            @JsonProperty("values") final Map<String, java.lang.Object> values,
+            @JsonAnySetter @JsonProperty("values") final Map<String, java.lang.Object> values,
             @JsonProperty("conflictingPrice") final com.commercetools.api.models.common.Price conflictingPrice) {
         this.message = message;
         this.values = values;