diff --git a/changes.md b/changes.md index e2bd167ff7c..0ec4167409d 100644 --- a/changes.md +++ b/changes.md @@ -1,66 +1,8 @@ **Api changes** -
-Added Resource(s) - -- added resource `/{projectKey}/in-store/key={storeKey}/business-units` -- added resource `/{projectKey}/in-store/key={storeKey}/business-units/key={key}` -- added resource `/{projectKey}/in-store/key={storeKey}/business-units/{ID}` -
- - -
-Required Property(s) - -- :warning: changed property `triggerPattern` of type `CartDiscountPatternTarget` to be required -- changed property `images` of type `ProductTailoringSetExternalImagesAction` to be optional -
- - -
-Added Property(s) - -- added property `inheritedStores` to type `BusinessUnit` -- added property `inheritedStores` to type `Company` -- added property `inheritedStores` to type `Division` -
- - -
-Added Method(s) - -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().get()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().head()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().post()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withKey().get()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withKey().head()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withKey().post()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withKey().delete()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withId().get()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withId().head()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withId().post()` -- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().businessUnits().withId().delete()` -
- -**History changes** -
Changed Property(s) -- :warning: changed property `extensions` of type `GraphQLError` from type `GraphQLErrorObject` to `object` -
- - -
-Required Property(s) - -- :warning: changed property `triggerPattern` of type `ChangeTargetPatternChangeValue` to be required -
- - -
-Removed Type(s) - -- :warning: removed type `GraphQLErrorObject` +- :warning: changed property `discount` of type `DiscountedTotalPricePortion` from type `CartDiscountReference` to `Reference`
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortion.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortion.java index e9282b25b2b..d602257724f 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortion.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortion.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; -import com.commercetools.api.models.cart_discount.CartDiscountReference; +import com.commercetools.api.models.common.Reference; import com.commercetools.api.models.common.TypedMoney; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.*; @@ -36,13 +36,13 @@ public interface DiscountedTotalPricePortion { /** - *

Cart Discount related to the discounted price.

+ *

A CartDiscountReference or DirectDiscountReference to the discount applied on the Cart totalPrice.

* @return discount */ @NotNull @Valid @JsonProperty("discount") - public CartDiscountReference getDiscount(); + public Reference getDiscount(); /** *

Money value of the discount.

@@ -54,11 +54,11 @@ public interface DiscountedTotalPricePortion { public TypedMoney getDiscountedAmount(); /** - *

Cart Discount related to the discounted price.

+ *

A CartDiscountReference or DirectDiscountReference to the discount applied on the Cart totalPrice.

* @param discount value to be set */ - public void setDiscount(final CartDiscountReference discount); + public void setDiscount(final Reference discount); /** *

Money value of the discount.

@@ -98,8 +98,7 @@ public static DiscountedTotalPricePortion deepCopy(@Nullable final DiscountedTot return null; } DiscountedTotalPricePortionImpl instance = new DiscountedTotalPricePortionImpl(); - instance.setDiscount( - com.commercetools.api.models.cart_discount.CartDiscountReference.deepCopy(template.getDiscount())); + instance.setDiscount(com.commercetools.api.models.common.Reference.deepCopy(template.getDiscount())); instance.setDiscountedAmount( com.commercetools.api.models.common.TypedMoney.deepCopy(template.getDiscountedAmount())); return instance; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionBuilder.java index 076ebe95c9e..08d79ca6e56 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionBuilder.java @@ -23,44 +23,30 @@ @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen") public class DiscountedTotalPricePortionBuilder implements Builder { - private com.commercetools.api.models.cart_discount.CartDiscountReference discount; + private com.commercetools.api.models.common.Reference discount; private com.commercetools.api.models.common.TypedMoney discountedAmount; /** - *

Cart Discount related to the discounted price.

- * @param builder function to build the discount value + *

A CartDiscountReference or DirectDiscountReference to the discount applied on the Cart totalPrice.

+ * @param discount value to be set * @return Builder */ - public DiscountedTotalPricePortionBuilder discount( - Function builder) { - this.discount = builder.apply(com.commercetools.api.models.cart_discount.CartDiscountReferenceBuilder.of()) - .build(); + public DiscountedTotalPricePortionBuilder discount(final com.commercetools.api.models.common.Reference discount) { + this.discount = discount; return this; } /** - *

Cart Discount related to the discounted price.

+ *

A CartDiscountReference or DirectDiscountReference to the discount applied on the Cart totalPrice.

* @param builder function to build the discount value * @return Builder */ - public DiscountedTotalPricePortionBuilder withDiscount( - Function builder) { - this.discount = builder.apply(com.commercetools.api.models.cart_discount.CartDiscountReferenceBuilder.of()); - return this; - } - - /** - *

Cart Discount related to the discounted price.

- * @param discount value to be set - * @return Builder - */ - public DiscountedTotalPricePortionBuilder discount( - final com.commercetools.api.models.cart_discount.CartDiscountReference discount) { - this.discount = discount; + Function> builder) { + this.discount = builder.apply(com.commercetools.api.models.common.ReferenceBuilder.of()).build(); return this; } @@ -89,11 +75,11 @@ public DiscountedTotalPricePortionBuilder discountedAmount( } /** - *

Cart Discount related to the discounted price.

+ *

A CartDiscountReference or DirectDiscountReference to the discount applied on the Cart totalPrice.

* @return discount */ - public com.commercetools.api.models.cart_discount.CartDiscountReference getDiscount() { + public com.commercetools.api.models.common.Reference getDiscount() { return this.discount; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionImpl.java index 0bcab7719ce..f215bc21b1e 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionImpl.java @@ -22,7 +22,7 @@ @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen") public class DiscountedTotalPricePortionImpl implements DiscountedTotalPricePortion, ModelBase { - private com.commercetools.api.models.cart_discount.CartDiscountReference discount; + private com.commercetools.api.models.common.Reference discount; private com.commercetools.api.models.common.TypedMoney discountedAmount; @@ -31,7 +31,7 @@ public class DiscountedTotalPricePortionImpl implements DiscountedTotalPricePort */ @JsonCreator DiscountedTotalPricePortionImpl( - @JsonProperty("discount") final com.commercetools.api.models.cart_discount.CartDiscountReference discount, + @JsonProperty("discount") final com.commercetools.api.models.common.Reference discount, @JsonProperty("discountedAmount") final com.commercetools.api.models.common.TypedMoney discountedAmount) { this.discount = discount; this.discountedAmount = discountedAmount; @@ -44,10 +44,10 @@ public DiscountedTotalPricePortionImpl() { } /** - *

Cart Discount related to the discounted price.

+ *

A CartDiscountReference or DirectDiscountReference to the discount applied on the Cart totalPrice.

*/ - public com.commercetools.api.models.cart_discount.CartDiscountReference getDiscount() { + public com.commercetools.api.models.common.Reference getDiscount() { return this.discount; } @@ -59,7 +59,7 @@ public com.commercetools.api.models.common.TypedMoney getDiscountedAmount() { return this.discountedAmount; } - public void setDiscount(final com.commercetools.api.models.cart_discount.CartDiscountReference discount) { + public void setDiscount(final com.commercetools.api.models.common.Reference discount) { this.discount = discount; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/expansion/cart/DiscountedTotalPricePortionExpansionBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/expansion/cart/DiscountedTotalPricePortionExpansionBuilderDsl.java index ef0751d8223..5850b63b343 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/expansion/cart/DiscountedTotalPricePortionExpansionBuilderDsl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/expansion/cart/DiscountedTotalPricePortionExpansionBuilderDsl.java @@ -29,8 +29,8 @@ public List getPath() { return path; } - public com.commercetools.api.predicates.expansion.cart_discount.CartDiscountReferenceExpansionBuilderDsl discount() { - return com.commercetools.api.predicates.expansion.cart_discount.CartDiscountReferenceExpansionBuilderDsl + public com.commercetools.api.predicates.expansion.common.ReferenceExpansionBuilderDsl discount() { + return com.commercetools.api.predicates.expansion.common.ReferenceExpansionBuilderDsl .of(appendOne(path, "discount")); } } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/DiscountedTotalPricePortionQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/DiscountedTotalPricePortionQueryBuilderDsl.java index 0200ec73125..b6fd28a0a49 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/DiscountedTotalPricePortionQueryBuilderDsl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/DiscountedTotalPricePortionQueryBuilderDsl.java @@ -14,11 +14,11 @@ public static DiscountedTotalPricePortionQueryBuilderDsl of() { } public CombinationQueryPredicate discount( - Function> fn) { - return new CombinationQueryPredicate<>(ContainerQueryPredicate.of() - .parent(ConstantQueryPredicate.of().constant("discount")) - .inner(fn.apply( - com.commercetools.api.predicates.query.cart_discount.CartDiscountReferenceQueryBuilderDsl.of())), + Function> fn) { + return new CombinationQueryPredicate<>( + ContainerQueryPredicate.of() + .parent(ConstantQueryPredicate.of().constant("discount")) + .inner(fn.apply(com.commercetools.api.predicates.query.common.ReferenceQueryBuilderDsl.of())), DiscountedTotalPricePortionQueryBuilderDsl::of); } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java index 91fa02ea196..8152d92d9d0 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java @@ -26,7 +26,7 @@ public void buildUnchecked(DiscountedTotalPricePortionBuilder builder) { public static Object[][] objectBuilder() { return new Object[][] { new Object[] { DiscountedTotalPricePortion.builder() - .discount(new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl()) }, + .discount(new com.commercetools.api.models.common.ReferenceImpl()) }, new Object[] { DiscountedTotalPricePortion.builder() .discountedAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) } }; } @@ -34,9 +34,8 @@ public static Object[][] objectBuilder() { @Test public void discount() { DiscountedTotalPricePortion value = DiscountedTotalPricePortion.of(); - value.setDiscount(new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl()); - Assertions.assertThat(value.getDiscount()) - .isEqualTo(new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl()); + value.setDiscount(new com.commercetools.api.models.common.ReferenceImpl()); + Assertions.assertThat(value.getDiscount()).isEqualTo(new com.commercetools.api.models.common.ReferenceImpl()); } @Test diff --git a/reference.txt b/reference.txt new file mode 100644 index 00000000000..898bcc8a8a9 --- /dev/null +++ b/reference.txt @@ -0,0 +1 @@ +64c89a7773b97bd6425a82d7d8cee1a9f0f3e6e2 diff --git a/references.txt b/references.txt index e771adfa288..4b8be8bba41 100644 --- a/references.txt +++ b/references.txt @@ -361,3 +361,4 @@ e3d5bc9cb69146c5d1dd755ed5e8cf2f54566b3a 591d5eaefd1d56fd350895ccea401cb42f2f0ee8 2cad0e3daf32cb4eacc6b08feef37acb27065b0b 64c89a7773b97bd6425a82d7d8cee1a9f0f3e6e2 +f28a1461a4122eed74c423156f1969ba204e6948