Merge branch 'main' into SUPPORT-28804_add_deserializer_for_import_api

Author: lojzatran

CHANGELOG.md

@@ -1,48 +1,35 @@
 
-# 17.16.0 (2024-10-07)
+# 17.17.0 (2024-11-07)
 
-**Api changes**
-
-<details>
-<summary>Added Property(s)</summary>
-
-- added property `warnings` to type `ProductTailoring`
-- added property `attributes` to type `ProductVariantTailoring`
-- added property `attributes` to type `ProductVariantTailoringDraft`
-- added property `attributes` to type `ProductTailoringAddVariantAction`
-- added property `warnings` to type `Product`
-- added property `customers` to type `SearchIndexingConfiguration`
-</details>
-
-
-<details>
-<summary>Added Type(s)</summary>
-
-- added type `SearchNotReadyError`
-- added type `GraphQLSearchNotReadyError`
-- added type `ProductTailoringAttribute`
-- added type `ProductTailoringSetAttributeAction`
-- added type `ProductTailoringSetAttributeInAllVariantsAction`
-- added type `ImageProcessingOngoingWarning`
-- added type `WarningObject`
-</details>
-
-
-<details>
-<summary>Removed Type(s)</summary>
-
-- :warning: removed type `ProductSearchStatus`
-</details>
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/739
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/740
+* optimize OkHttp3 client by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/741
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/743
+* fix exportSignatures plugin by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/745
+* Fix deserialization if subtype discriminator is missing by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/746
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/747
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/749
 
 
-<details>
-<summary>Added Enum(s)</summary>
-
-- added enum `customer-group` to type `ExtensionResourceTypeId`
-- added enum `product-tailoring` to type `MessageSubscriptionResourceTypeId`
-- added enum `product-tailoring` to type `ResourceTypeId`
-</details>
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.16.0...17.17.0
 
+# 17.16.0 (2024-10-07)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/728
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/729
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/730
+* update service regions by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/731
+* Create config.yml by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/732
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/733
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/735
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/736
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/737
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/738
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.15.1...17.16.0
 
 # 17.15.1 (2024-09-17)
 

README.md

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

changes.md

@@ -1,49 +1,19 @@
 **Api changes**
 
 <details>
-<summary>Added Type(s)</summary>
+<summary>Changed Property(s)</summary>
 
-- added type `ApprovalRuleSetCustomFieldAction`
-- added type `ApprovalRuleSetCustomTypeAction`
+- :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 Property(s)</summary>
+<summary>Added QueryParameter(s)</summary>
 
-- added property `custom` to type `ApprovalRule`
-- added property `source` to type `EventBridgeDestination`
-</details>
-
-
-<details>
-<summary>Added Enum(s)</summary>
-
-- added enum `approval-rule` to type `CustomFieldReferenceValue`
-- added enum `approval-rule` to type `ResourceTypeId`
-</details>
-
-
-<details>
-<summary>Added Method(s)</summary>
-
-- added method `apiRoot.withProjectKey().productTailoring().head()`
-</details>
-
-**Import changes**
-
-<details>
-<summary>Added Type(s)</summary>
-
-- added type `InvalidFieldsUpdateError`
-- added type `NewMasterVariantAdditionNotAllowedError`
-</details>
-
-**History changes**
-
-<details>
-<summary>Required Property(s)</summary>
-
-- changed property `id` of type `ModifiedBy` to be optional
+- 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>
 

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/ConcurrentModificationTest.java

@@ -195,6 +195,9 @@ public void concurrentModMiddlewareSuccess() {
                             .build())
                     .executeBlocking()
                     .getBody();
+
+            Assertions.assertThat(modCart.getId()).isEqualTo(cart.getId());
+            Assertions.assertThat(modCart.getVersion()).isGreaterThan(cart.getVersion());
             return modCart;
         });
     }
@@ -230,6 +233,11 @@ public void concurrentModMiddleware() {
                             .build())
                     .executeBlocking()
                     .getBody();
+
+            Assertions.assertThat(modCart.getId()).isEqualTo(cart.getId());
+            Assertions.assertThat(modCart.getVersion()).isGreaterThan(cart.getVersion());
+            Assertions.assertThat(modCart.getVersion()).isGreaterThan(deCart.getBody().getVersion());
+
             return modCart;
         });
     }

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/TimeoutTest.java

@@ -58,4 +58,39 @@ public void timeoutWithRetry() {
                     .getBody();
         });
     }
+
+    @Test
+    public void timeoutWithRetryTimeout() {
+        String projectKey = CommercetoolsTestUtils.getProjectKey();
+
+        ProjectApiRoot b = ApiRootBuilder.of()
+                .defaultClient(ClientCredentials.of()
+                        .withClientId(CommercetoolsTestUtils.getClientId())
+                        .withClientSecret(CommercetoolsTestUtils.getClientSecret())
+                        .build(),
+                    ServiceRegion.GCP_EUROPE_WEST1)
+                .withTelemetryMiddleware((request, next) -> next.apply(request).thenApply((response) -> {
+                    try {
+                        Thread.sleep(15000); // ensure timeout
+                    }
+                    catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    return response;
+                }))
+                .withPolicies(policyBuilder -> policyBuilder.withTimeout(Duration.ofSeconds(7))
+                        .withRetry(builder -> builder.maxRetries(3)
+                                .statusCodes(singletonList(HttpStatusCode.NOT_FOUND_404))
+                                .failures(singletonList(TimeoutExceededException.class)))
+                        .withTimeout(Duration.ofSeconds(3)))
+                .build(projectKey);
+
+        Assertions.assertThatExceptionOfType(TimeoutExceededException.class).isThrownBy(() -> {
+            Category category = b.categories()
+                    .withId("fdbaf4ea-fbc9-4fea-bac4-1d7e6c1995b3")
+                    .get()
+                    .executeBlocking()
+                    .getBody();
+        });
+    }
 }

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyCustomObjectsPost.java

@@ -21,7 +21,7 @@
 
 /**
  *  <p>If an object with the given container/key exists, the object will be replaced with the new value and the version is incremented. If the request contains a version and an object with the given container/key, then the version must match the version of the existing object. Concurrent updates to the same Custom Object returns a ConcurrentModification error even if the version is not provided.</p>
- *  <p>Fields with <code>null</code> values will <strong>not be saved</strong>.</p>
+ *  <p>Fields within <code>value</code> that have <code>null</code> values <strong>are not saved</strong>.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyCustomObjectsPostString.java

@@ -22,7 +22,7 @@
 
 /**
  *  <p>If an object with the given container/key exists, the object will be replaced with the new value and the version is incremented. If the request contains a version and an object with the given container/key, then the version must match the version of the existing object. Concurrent updates to the same Custom Object returns a ConcurrentModification error even if the version is not provided.</p>
- *  <p>Fields with <code>null</code> values will <strong>not be saved</strong>.</p>
+ *  <p>Fields within <code>value</code> that have <code>null</code> values <strong>are not saved</strong>.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyGraphqlPost.java

@@ -16,7 +16,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Execute a GraphQL query</p>
+ *  <p>Execute a GraphQL request.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyGraphqlPostString.java

@@ -17,7 +17,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Execute a GraphQL query</p>
+ *  <p>Execute a GraphQL request.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyProductSelectionsByIDProductsGet.java

@@ -99,6 +99,10 @@ public String getID() {
         return this.ID;
     }
 
+    public List<String> getWhere() {
+        return this.getQueryParam("where");
+    }
+
     public List<String> getExpand() {
         return this.getQueryParam("expand");
     }
@@ -127,6 +131,85 @@ public void setID(final String ID) {
         this.ID = ID;
     }
 
+    /**
+     * set where with the specified value
+     * @param where value to be set
+     * @param <TValue> value type
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public <TValue> ByProjectKeyProductSelectionsByIDProductsGet withWhere(final TValue where) {
+        return copy().withQueryParam("where", where);
+    }
+
+    /**
+     * add additional where query parameter
+     * @param where value to be added
+     * @param <TValue> value type
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public <TValue> ByProjectKeyProductSelectionsByIDProductsGet addWhere(final TValue where) {
+        return copy().addQueryParam("where", where);
+    }
+
+    /**
+     * set where with the specified value
+     * @param supplier supplier for the value to be set
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public ByProjectKeyProductSelectionsByIDProductsGet withWhere(final Supplier<String> supplier) {
+        return copy().withQueryParam("where", supplier.get());
+    }
+
+    /**
+     * add additional where query parameter
+     * @param supplier supplier for the value to be added
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public ByProjectKeyProductSelectionsByIDProductsGet addWhere(final Supplier<String> supplier) {
+        return copy().addQueryParam("where", supplier.get());
+    }
+
+    /**
+     * set where with the specified value
+     * @param op builder for the value to be set
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public ByProjectKeyProductSelectionsByIDProductsGet withWhere(final Function<StringBuilder, StringBuilder> op) {
+        return copy().withQueryParam("where", op.apply(new StringBuilder()));
+    }
+
+    /**
+     * add additional where query parameter
+     * @param op builder for the value to be added
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public ByProjectKeyProductSelectionsByIDProductsGet addWhere(final Function<StringBuilder, StringBuilder> op) {
+        return copy().addQueryParam("where", op.apply(new StringBuilder()));
+    }
+
+    /**
+     * set where with the specified values
+     * @param where values to be set
+     * @param <TValue> value type
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public <TValue> ByProjectKeyProductSelectionsByIDProductsGet withWhere(final Collection<TValue> where) {
+        return copy().withoutQueryParam("where")
+                .addQueryParams(
+                    where.stream().map(s -> new ParamEntry<>("where", s.toString())).collect(Collectors.toList()));
+    }
+
+    /**
+     * add additional where query parameters
+     * @param where values to be added
+     * @param <TValue> value type
+     * @return ByProjectKeyProductSelectionsByIDProductsGet
+     */
+    public <TValue> ByProjectKeyProductSelectionsByIDProductsGet addWhere(final Collection<TValue> where) {
+        return copy().addQueryParams(
+            where.stream().map(s -> new ParamEntry<>("where", s.toString())).collect(Collectors.toList()));
+    }
+
     /**
      * set expand with the specified value
      * @param expand value to be set