Skip to content

Commit 8ce25fa

Browse files
committed
Merge branch 'main' into update_spring_version_for_example_project
# Conflicts: # examples/spring-newrelic/build.gradle # examples/spring/build.gradle
2 parents 77e4e62 + 9ffd3aa commit 8ce25fa

File tree

93 files changed

+392
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+392
-369
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11

2+
# 17.20.0 (2024-12-02)
3+
4+
## What's Changed
5+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/763
6+
* 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
7+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/766
8+
9+
10+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.19.0...17.20.0
11+
212
# 17.19.0 (2024-11-21)
313

414
## Important notice

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The latest stable SDK release can be retrieved from [Maven Central](https://sear
2121
```gradle
2222
ext {
2323
versions = [
24-
commercetools: "17.19.0"
24+
commercetools: "17.20.0"
2525
]
2626
}
2727
@@ -42,7 +42,7 @@ dependencies {
4242

4343
```maven
4444
<properties>
45-
<commercetools.version>17.19.0</commercetools.version>
45+
<commercetools.version>17.20.0</commercetools.version>
4646
</properties>
4747
<dependencies>
4848
<dependency>

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/client/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyPost.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.apache.commons.lang3.builder.HashCodeBuilder;
1717

1818
/**
19-
* <p>Creates a new import request for product variant patches</p>
19+
* <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>
2020
*
2121
* <hr>
2222
* <div class=code-example>

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/client/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyPostString.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.apache.commons.lang3.builder.HashCodeBuilder;
1818

1919
/**
20-
* <p>Creates a new import request for product variant patches</p>
20+
* <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>
2121
*
2222
* <hr>
2323
* <div class=code-example>

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/models/categories/CategoryImport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public interface CategoryImport extends ImportResource {
123123
public LocalizedString getMetaKeywords();
124124

125125
/**
126-
*
126+
* <p>Maps to <code>Category.assets</code>.</p>
127127
* @return assets
128128
*/
129129
@Valid
@@ -209,15 +209,15 @@ public interface CategoryImport extends ImportResource {
209209
public void setMetaKeywords(final LocalizedString metaKeywords);
210210

211211
/**
212-
* set assets
212+
* <p>Maps to <code>Category.assets</code>.</p>
213213
* @param assets values to be set
214214
*/
215215

216216
@JsonIgnore
217217
public void setAssets(final Asset... assets);
218218

219219
/**
220-
* set assets
220+
* <p>Maps to <code>Category.assets</code>.</p>
221221
* @param assets values to be set
222222
*/
223223

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/models/categories/CategoryImportBuilder.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public CategoryImportBuilder metaKeywords(
345345
}
346346

347347
/**
348-
* set values to the assets
348+
* <p>Maps to <code>Category.assets</code>.</p>
349349
* @param assets value to be set
350350
* @return Builder
351351
*/
@@ -356,7 +356,7 @@ public CategoryImportBuilder assets(@Nullable final com.commercetools.importapi.
356356
}
357357

358358
/**
359-
* set value to the assets
359+
* <p>Maps to <code>Category.assets</code>.</p>
360360
* @param assets value to be set
361361
* @return Builder
362362
*/
@@ -368,7 +368,7 @@ public CategoryImportBuilder assets(
368368
}
369369

370370
/**
371-
* add values to the assets
371+
* <p>Maps to <code>Category.assets</code>.</p>
372372
* @param assets value to be set
373373
* @return Builder
374374
*/
@@ -382,7 +382,7 @@ public CategoryImportBuilder plusAssets(@Nullable final com.commercetools.import
382382
}
383383

384384
/**
385-
* add the value to the assets using the builder function
385+
* <p>Maps to <code>Category.assets</code>.</p>
386386
* @param builder function to build the assets value
387387
* @return Builder
388388
*/
@@ -397,7 +397,7 @@ public CategoryImportBuilder plusAssets(
397397
}
398398

399399
/**
400-
* set the value to the assets using the builder function
400+
* <p>Maps to <code>Category.assets</code>.</p>
401401
* @param builder function to build the assets value
402402
* @return Builder
403403
*/
@@ -410,7 +410,7 @@ public CategoryImportBuilder withAssets(
410410
}
411411

412412
/**
413-
* add the value to the assets using the builder function
413+
* <p>Maps to <code>Category.assets</code>.</p>
414414
* @param builder function to build the assets value
415415
* @return Builder
416416
*/
@@ -421,7 +421,7 @@ public CategoryImportBuilder addAssets(
421421
}
422422

423423
/**
424-
* set the value to the assets using the builder function
424+
* <p>Maps to <code>Category.assets</code>.</p>
425425
* @param builder function to build the assets value
426426
* @return Builder
427427
*/
@@ -564,7 +564,7 @@ public com.commercetools.importapi.models.common.LocalizedString getMetaKeywords
564564
}
565565

566566
/**
567-
* value of assets}
567+
* <p>Maps to <code>Category.assets</code>.</p>
568568
* @return assets
569569
*/
570570

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/models/categories/CategoryImportImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public com.commercetools.importapi.models.common.LocalizedString getMetaKeywords
162162
}
163163

164164
/**
165-
*
165+
* <p>Maps to <code>Category.assets</code>.</p>
166166
*/
167167

168168
public java.util.List<com.commercetools.importapi.models.common.Asset> getAssets() {

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/models/common/DiscountedPrice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public interface DiscountedPrice {
3535

3636
/**
37-
*
37+
* <p>Money value of the discounted price.</p>
3838
* @return value
3939
*/
4040
@NotNull
@@ -52,7 +52,7 @@ public interface DiscountedPrice {
5252
public ProductDiscountKeyReference getDiscount();
5353

5454
/**
55-
* set value
55+
* <p>Money value of the discounted price.</p>
5656
* @param value value to be set
5757
*/
5858

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/models/common/DiscountedPriceBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class DiscountedPriceBuilder implements Builder<DiscountedPrice> {
2828
private com.commercetools.importapi.models.common.ProductDiscountKeyReference discount;
2929

3030
/**
31-
* set the value to the value
31+
* <p>Money value of the discounted price.</p>
3232
* @param value value to be set
3333
* @return Builder
3434
*/
@@ -39,7 +39,7 @@ public DiscountedPriceBuilder value(final com.commercetools.importapi.models.com
3939
}
4040

4141
/**
42-
* set the value to the value using the builder function
42+
* <p>Money value of the discounted price.</p>
4343
* @param builder function to build the value value
4444
* @return Builder
4545
*/
@@ -89,7 +89,7 @@ public DiscountedPriceBuilder discount(
8989
}
9090

9191
/**
92-
* value of value}
92+
* <p>Money value of the discounted price.</p>
9393
* @return value
9494
*/
9595

commercetools/commercetools-sdk-java-importapi/src/main/java-generated/com/commercetools/importapi/models/common/DiscountedPriceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public DiscountedPriceImpl() {
4343
}
4444

4545
/**
46-
*
46+
* <p>Money value of the discounted price.</p>
4747
*/
4848

4949
public com.commercetools.importapi.models.common.TypedMoney getValue() {

0 commit comments

Comments
 (0)