Merge branch 'main' into update_spring_version_for_example_project

# Conflicts: # examples/spring-newrelic/build.gradle # examples/spring/build.gradle
commercetools · Dec 5, 2024 · 8ce25fa · 8ce25fa
2 parents 77e4e62 + 9ffd3aa
commit 8ce25fa
Show file tree

Hide file tree

Showing 93 changed files with 392 additions and 369 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
 
+# 17.20.0 (2024-12-02)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/763
+* Add option to provide custom auth and api url for spring example project by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/764
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/766
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.19.0...17.20.0
+
 # 17.19.0 (2024-11-21)
 
 ## Important notice

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.19.0"
+        commercetools: "17.20.0"
     ]
 }
 
@@ -42,7 +42,7 @@ dependencies {
 
 ```maven
 <properties>
-    <commercetools.version>17.19.0</commercetools.version>
+    <commercetools.version>17.20.0</commercetools.version>
 </properties>
 <dependencies>
     <dependency>

diff --git a/...api/client/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyPost.java b/...api/client/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyPost.java
@@ -16,7 +16,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Creates a new import request for product variant patches</p>
+ *  <p>Creates a new import request for Product Variant Patches. Returns an InvalidField error if the ProductVariantPatchRequest contains patches with and without the <code>product</code> field set.</p>
  *
  * <hr>
  * <div class=code-example>

diff --git a/...ient/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyPostString.java b/...ient/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyPostString.java
@@ -17,7 +17,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Creates a new import request for product variant patches</p>
+ *  <p>Creates a new import request for Product Variant Patches. Returns an InvalidField error if the ProductVariantPatchRequest contains patches with and without the <code>product</code> field set.</p>
  *
  * <hr>
  * <div class=code-example>

diff --git a/...src/main/java-generated/com/commercetools/importapi/models/categories/CategoryImport.java b/...src/main/java-generated/com/commercetools/importapi/models/categories/CategoryImport.java
@@ -123,7 +123,7 @@ public interface CategoryImport extends ImportResource {
     public LocalizedString getMetaKeywords();
 
     /**
-     *
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @return assets
      */
     @Valid
@@ -209,15 +209,15 @@ public interface CategoryImport extends ImportResource {
     public void setMetaKeywords(final LocalizedString metaKeywords);
 
     /**
-     * set assets
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param assets values to be set
      */
 
     @JsonIgnore
     public void setAssets(final Asset... assets);
 
     /**
-     * set assets
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param assets values to be set
      */
 

diff --git a/...n/java-generated/com/commercetools/importapi/models/categories/CategoryImportBuilder.java b/...n/java-generated/com/commercetools/importapi/models/categories/CategoryImportBuilder.java
@@ -345,7 +345,7 @@ public CategoryImportBuilder metaKeywords(
     }
 
     /**
-     * set values to the assets
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param assets value to be set
      * @return Builder
      */
@@ -356,7 +356,7 @@ public CategoryImportBuilder assets(@Nullable final com.commercetools.importapi.
     }
 
     /**
-     * set value to the assets
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param assets value to be set
      * @return Builder
      */
@@ -368,7 +368,7 @@ public CategoryImportBuilder assets(
     }
 
     /**
-     * add values to the assets
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param assets value to be set
      * @return Builder
      */
@@ -382,7 +382,7 @@ public CategoryImportBuilder plusAssets(@Nullable final com.commercetools.import
     }
 
     /**
-     * add the value to the assets using the builder function
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param builder function to build the assets value
      * @return Builder
      */
@@ -397,7 +397,7 @@ public CategoryImportBuilder plusAssets(
     }
 
     /**
-     * set the value to the assets using the builder function
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param builder function to build the assets value
      * @return Builder
      */
@@ -410,7 +410,7 @@ public CategoryImportBuilder withAssets(
     }
 
     /**
-     * add the value to the assets using the builder function
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param builder function to build the assets value
      * @return Builder
      */
@@ -421,7 +421,7 @@ public CategoryImportBuilder addAssets(
     }
 
     /**
-     * set the value to the assets using the builder function
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @param builder function to build the assets value
      * @return Builder
      */
@@ -564,7 +564,7 @@ public com.commercetools.importapi.models.common.LocalizedString getMetaKeywords
     }
 
     /**
-     * value of assets}
+     *  <p>Maps to <code>Category.assets</code>.</p>
      * @return assets
      */
 

diff --git a/...main/java-generated/com/commercetools/importapi/models/categories/CategoryImportImpl.java b/...main/java-generated/com/commercetools/importapi/models/categories/CategoryImportImpl.java
@@ -162,7 +162,7 @@ public com.commercetools.importapi.models.common.LocalizedString getMetaKeywords
     }
 
     /**
-     *
+     *  <p>Maps to <code>Category.assets</code>.</p>
      */
 
     public java.util.List<com.commercetools.importapi.models.common.Asset> getAssets() {

diff --git a/...pi/src/main/java-generated/com/commercetools/importapi/models/common/DiscountedPrice.java b/...pi/src/main/java-generated/com/commercetools/importapi/models/common/DiscountedPrice.java
@@ -34,7 +34,7 @@
 public interface DiscountedPrice {
 
     /**
-     *
+     *  <p>Money value of the discounted price.</p>
      * @return value
      */
     @NotNull
@@ -52,7 +52,7 @@ public interface DiscountedPrice {
     public ProductDiscountKeyReference getDiscount();
 
     /**
-     * set value
+     *  <p>Money value of the discounted price.</p>
      * @param value value to be set
      */
 

diff --git a/...main/java-generated/com/commercetools/importapi/models/common/DiscountedPriceBuilder.java b/...main/java-generated/com/commercetools/importapi/models/common/DiscountedPriceBuilder.java
@@ -28,7 +28,7 @@ public class DiscountedPriceBuilder implements Builder<DiscountedPrice> {
     private com.commercetools.importapi.models.common.ProductDiscountKeyReference discount;
 
     /**
-     * set the value to the value
+     *  <p>Money value of the discounted price.</p>
      * @param value value to be set
      * @return Builder
      */
@@ -39,7 +39,7 @@ public DiscountedPriceBuilder value(final com.commercetools.importapi.models.com
     }
 
     /**
-     * set the value to the value using the builder function
+     *  <p>Money value of the discounted price.</p>
      * @param builder function to build the value value
      * @return Builder
      */
@@ -89,7 +89,7 @@ public DiscountedPriceBuilder discount(
     }
 
     /**
-     * value of value}
+     *  <p>Money value of the discounted price.</p>
      * @return value
      */
 

diff --git a/...rc/main/java-generated/com/commercetools/importapi/models/common/DiscountedPriceImpl.java b/...rc/main/java-generated/com/commercetools/importapi/models/common/DiscountedPriceImpl.java
@@ -43,7 +43,7 @@ public DiscountedPriceImpl() {
     }
 
     /**
-     *
+     *  <p>Money value of the discounted price.</p>
      */
 
     public com.commercetools.importapi.models.common.TypedMoney getValue() {

diff --git a/...c/main/java-generated/com/commercetools/importapi/models/common/UnresolvedReferences.java b/...c/main/java-generated/com/commercetools/importapi/models/common/UnresolvedReferences.java
@@ -15,7 +15,7 @@
 import jakarta.validation.constraints.NotNull;
 
 /**
- * UnresolvedReferences
+ *  <p>References a resource which could not be resolved.</p>
  *
  * <hr>
  * Example to create an instance using the builder pattern
@@ -33,30 +33,30 @@
 public interface UnresolvedReferences {
 
     /**
-     *
+     *  <p>The <code>key</code> of the resource.</p>
      * @return key
      */
     @NotNull
     @JsonProperty("key")
     public String getKey();
 
     /**
-     *  <p>The type of the referenced resource.</p>
+     *  <p>The type of resource.</p>
      * @return typeId
      */
     @NotNull
     @JsonProperty("typeId")
     public ReferenceType getTypeId();
 
     /**
-     * set key
+     *  <p>The <code>key</code> of the resource.</p>
      * @param key value to be set
      */
 
     public void setKey(final String key);
 
     /**
-     *  <p>The type of the referenced resource.</p>
+     *  <p>The type of resource.</p>
      * @param typeId value to be set
      */
 

diff --git a/...java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesBuilder.java b/...java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesBuilder.java
@@ -27,7 +27,7 @@ public class UnresolvedReferencesBuilder implements Builder<UnresolvedReferences
     private com.commercetools.importapi.models.common.ReferenceType typeId;
 
     /**
-     * set the value to the key
+     *  <p>The <code>key</code> of the resource.</p>
      * @param key value to be set
      * @return Builder
      */
@@ -38,7 +38,7 @@ public UnresolvedReferencesBuilder key(final String key) {
     }
 
     /**
-     *  <p>The type of the referenced resource.</p>
+     *  <p>The type of resource.</p>
      * @param typeId value to be set
      * @return Builder
      */
@@ -49,7 +49,7 @@ public UnresolvedReferencesBuilder typeId(final com.commercetools.importapi.mode
     }
 
     /**
-     * value of key}
+     *  <p>The <code>key</code> of the resource.</p>
      * @return key
      */
 
@@ -58,7 +58,7 @@ public String getKey() {
     }
 
     /**
-     *  <p>The type of the referenced resource.</p>
+     *  <p>The type of resource.</p>
      * @return typeId
      */
 

diff --git a/...in/java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesImpl.java b/...in/java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesImpl.java
@@ -17,7 +17,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * UnresolvedReferences
+ *  <p>References a resource which could not be resolved.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
 public class UnresolvedReferencesImpl implements UnresolvedReferences, ModelBase {
@@ -43,15 +43,15 @@ public UnresolvedReferencesImpl() {
     }
 
     /**
-     *
+     *  <p>The <code>key</code> of the resource.</p>
      */
 
     public String getKey() {
         return this.key;
     }
 
     /**
-     *  <p>The type of the referenced resource.</p>
+     *  <p>The type of resource.</p>
      */
 
     public com.commercetools.importapi.models.common.ReferenceType getTypeId() {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         *
+         *  <p>Maps to <code>Category.assets</code>.</p>
          */
         public java.util.List<com.commercetools.importapi.models.common.Asset> getAssets() {
@@ Expand Down @@