diff --git a/changes.md b/changes.md index 50b4ed8c83a..38abf6ec2f1 100644 --- a/changes.md +++ b/changes.md @@ -38,3 +38,11 @@ - added property `discountTypeCombination` to type `Order` + +
+MarkDeprecated Property(s) + +- marked property `CountOnCustomLineItemUnits::excludeCount` as deprecated +- marked property `CountOnLineItemUnits::excludeCount` as deprecated +
+ diff --git a/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls b/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls index 3183c16bc33..81aad3e3a72 100644 --- a/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls +++ b/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls @@ -3128,7 +3128,7 @@ type CountOnCustomLineItemUnits implements PatternComponent { predicate: String! minCount: Int maxCount: Int - excludeCount: Int + excludeCount: Int @deprecated(reason: "Please use 'triggerPattern' to exclude.") type: String! } @@ -3137,7 +3137,7 @@ input CountOnCustomLineItemUnitsInput { predicate: String! minCount: Int = 1 maxCount: Int - excludeCount: Int + excludeCount: Int @deprecated(reason: "Please use 'triggerPattern' to exclude.") } "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" @@ -3145,7 +3145,7 @@ type CountOnLineItemUnits implements PatternComponent { predicate: String! minCount: Int maxCount: Int - excludeCount: Int + excludeCount: Int @deprecated(reason: "Please use 'triggerPattern' to exclude.") type: String! } @@ -3154,7 +3154,7 @@ input CountOnLineItemUnitsInput { predicate: String! minCount: Int = 1 maxCount: Int - excludeCount: Int + excludeCount: Int @deprecated(reason: "Please use 'triggerPattern' to exclude.") } "[ISO 3166-1](http://en.wikipedia.org/wiki/ISO_3166-1) country code." diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTarget.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTarget.java index 2e539f790f0..52422d41596 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTarget.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTarget.java @@ -43,8 +43,8 @@ public interface CartDiscountPatternTarget extends CartDiscountTarget { /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @return triggerPattern */ @NotNull @@ -82,8 +82,8 @@ public interface CartDiscountPatternTarget extends CartDiscountTarget { /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param triggerPattern values to be set */ @@ -92,8 +92,8 @@ public interface CartDiscountPatternTarget extends CartDiscountTarget { /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param triggerPattern values to be set */ diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetBuilder.java index def566fe0a3..1297e492ed6 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetBuilder.java @@ -37,8 +37,8 @@ public class CartDiscountPatternTargetBuilder implements BuilderDefines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param triggerPattern value to be set * @return Builder */ @@ -51,8 +51,8 @@ public CartDiscountPatternTargetBuilder triggerPattern( /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param triggerPattern value to be set * @return Builder */ @@ -65,8 +65,8 @@ public CartDiscountPatternTargetBuilder triggerPattern( /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param triggerPattern value to be set * @return Builder */ @@ -82,8 +82,8 @@ public CartDiscountPatternTargetBuilder plusTriggerPattern( /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param builder function to build the triggerPattern value * @return Builder */ @@ -100,8 +100,8 @@ public CartDiscountPatternTargetBuilder plusTriggerPattern( /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @param builder function to build the triggerPattern value * @return Builder */ @@ -219,8 +219,8 @@ public CartDiscountPatternTargetBuilder selectionMode( /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

* @return triggerPattern */ diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetImpl.java index 6a8c6ab05b7..e8f0a5022b7 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetImpl.java @@ -66,8 +66,8 @@ public String getType() { /** *

Defines the set of units of (Custom) Line Items in a Cart that trigger a discount application.

- *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. To further limit the discount application, set the maxOccurrence.

- *

If empty, the Discount will apply indefinitely.

+ *

Based on the availability of matching units, the triggerPattern can match multiple times, limiting the number of maximum times the discount will be applied. The units matched in the triggerPattern are excluded and not considered for the targetPattern.

+ *

To further limit the discount application, set the maxOccurrence.

*/ public java.util.List getTriggerPattern() { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnits.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnits.java index 9b932390116..0deef06ec54 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnits.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnits.java @@ -67,7 +67,7 @@ public interface CountOnCustomLineItemUnits extends PatternComponent { *

The units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

* @return excludeCount */ - + @Deprecated @JsonProperty("excludeCount") public Integer getExcludeCount(); @@ -99,7 +99,7 @@ public interface CountOnCustomLineItemUnits extends PatternComponent { *

The units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

* @param excludeCount value to be set */ - + @Deprecated public void setExcludeCount(final Integer excludeCount); /** diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsBuilder.java index 198317fea46..b993e987502 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsBuilder.java @@ -31,6 +31,7 @@ public class CountOnCustomLineItemUnitsBuilder implements BuilderThe units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

* @return excludeCount */ - + @Deprecated @Nullable public Integer getExcludeCount() { return this.excludeCount; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsImpl.java index 9e69d29b631..34c5287dc77 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsImpl.java @@ -30,6 +30,7 @@ public class CountOnCustomLineItemUnitsImpl implements CountOnCustomLineItemUnit private Integer maxCount; + @Deprecated private Integer excludeCount; /** @@ -91,7 +92,7 @@ public Integer getMaxCount() { *

Set only when configuring the targetPattern.

*

The units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

*/ - + @Deprecated public Integer getExcludeCount() { return this.excludeCount; } @@ -108,6 +109,7 @@ public void setMaxCount(final Integer maxCount) { this.maxCount = maxCount; } + @Deprecated public void setExcludeCount(final Integer excludeCount) { this.excludeCount = excludeCount; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnits.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnits.java index c4f7d5e5dfd..9b3fc67f170 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnits.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnits.java @@ -67,7 +67,7 @@ public interface CountOnLineItemUnits extends PatternComponent { *

The units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

* @return excludeCount */ - + @Deprecated @JsonProperty("excludeCount") public Integer getExcludeCount(); @@ -99,7 +99,7 @@ public interface CountOnLineItemUnits extends PatternComponent { *

The units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

* @param excludeCount value to be set */ - + @Deprecated public void setExcludeCount(final Integer excludeCount); /** diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsBuilder.java index 11784937cf9..167dfdf65b2 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsBuilder.java @@ -31,6 +31,7 @@ public class CountOnLineItemUnitsBuilder implements BuilderThe units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

* @return excludeCount */ - + @Deprecated @Nullable public Integer getExcludeCount() { return this.excludeCount; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsImpl.java index d60ee386354..f088b3afe52 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsImpl.java @@ -30,6 +30,7 @@ public class CountOnLineItemUnitsImpl implements CountOnLineItemUnits, ModelBase private Integer maxCount; + @Deprecated private Integer excludeCount; /** @@ -91,7 +92,7 @@ public Integer getMaxCount() { *

Set only when configuring the targetPattern.

*

The units matched first (satisfying the pattern component) will be excluded from the resulting set. The minCountand maxCount are considered only after the exclusion. Pattern components are matched only if any further units satisfying the pattern component exist. For example, if 5 jeans are required but only 3 should be discounted, the excludeCount value must be 2.

*/ - + @Deprecated public Integer getExcludeCount() { return this.excludeCount; } @@ -108,6 +109,7 @@ public void setMaxCount(final Integer maxCount) { this.maxCount = maxCount; } + @Deprecated public void setExcludeCount(final Integer excludeCount) { this.excludeCount = excludeCount; } diff --git a/references.txt b/references.txt index 17d5e425dce..7d7da2cf2d3 100644 --- a/references.txt +++ b/references.txt @@ -379,3 +379,4 @@ cf0f702598daf6d644ae327099b96b83f5539dfb 5f1b9a7bef052b7f67754d4eccf9d18d139d53c1 054434149a1d2198bd77716c69dbdc13d84cfbb1 bc499c5a4815716efc119199dd274dc72f538a36 +77fcf46413ef8bb5133eb0907f42cba037c54c61