diff --git a/changes.md b/changes.md index 4074481436c..630717f7ed1 100644 --- a/changes.md +++ b/changes.md @@ -46,6 +46,9 @@ - added property `applicationMode` to type `CartDiscountValueFixed` - added property `applicationMode` to type `CartDiscountValueFixedDraft` +- added property `custom` to type `CartSetCustomShippingMethodAction` +- added property `custom` to type `StagedOrderSetCustomShippingMethodAction` +- added property `custom` to type `StagedOrderSetShippingAddressAndCustomShippingMethodAction` **History changes** 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 d94cb58296d..bb45b714f8e 100644 --- a/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls +++ b/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls @@ -352,7 +352,6 @@ input AddProductVariantTailoring { id: Int sku: String images: [ImageInput!] = [] - "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" attributes: [ProductAttributeInput!] = [] assets: [AssetDraftInput!] = [] staged: Boolean = true @@ -8749,10 +8748,7 @@ input ProductTailoringUpdateAction { setAssetTags: SetProductTailoringAssetTags setImages: SetProductTailoringImages setDescription: SetProductTailoringDescription - "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" setAttribute: SetProductTailoringAttribute - - "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" setAttributeInAllVariants: SetProductTailoringAttributeInAllVariants setImageLabel: SetProductTailoringImageLabel setMetaAttributes: SetProductTailoringMetaAttributes @@ -9024,7 +9020,6 @@ type ProductVariantTailoring { id: Int! images: [Image!]! assets: [Asset!]! - "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" attributesRaw: [RawProductAttribute!]! } @@ -9041,7 +9036,6 @@ input ProductVariantTailoringInput { id: Int sku: String images: [ImageInput!] = [] - "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" attributes: [ProductAttributeInput!] = [] assets: [AssetDraftInput!] = [] } @@ -10804,6 +10798,7 @@ input SetCartCustomShippingMethod { shippingRate: ShippingRateDraft! taxCategory: ResourceIdentifierInput externalTaxRate: ExternalTaxRateDraft + custom: CustomFieldsDraft } input SetCartCustomType { @@ -11993,7 +11988,6 @@ input SetProductTailoringAssetTags { assetId: String } -"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" input SetProductTailoringAttribute { variantId: Int sku: String @@ -12002,7 +11996,6 @@ input SetProductTailoringAttribute { staged: Boolean = true } -"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta" input SetProductTailoringAttributeInAllVariants { name: String! value: String @@ -12399,6 +12392,7 @@ input SetStagedOrderCustomShippingMethod { shippingRate: ShippingRateDraft! taxCategory: ResourceIdentifierInput externalTaxRate: ExternalTaxRateDraft + custom: CustomFieldsDraft } type SetStagedOrderCustomShippingMethodOutput implements StagedOrderUpdateActionOutput { @@ -12407,6 +12401,7 @@ type SetStagedOrderCustomShippingMethodOutput implements StagedOrderUpdateAction shippingRate: ShippingRate! taxCategoryResId: ResourceIdentifier externalTaxRate: ExternalTaxRateDraftOutput + custom: CustomFieldsCommand } input SetStagedOrderCustomType { @@ -12869,6 +12864,7 @@ input SetStagedOrderShippingAddressAndCustomShippingMethod { shippingRate: ShippingRateDraft! taxCategory: ResourceIdentifierInput externalTaxRate: ExternalTaxRateDraft + custom: CustomFieldsDraft } type SetStagedOrderShippingAddressAndCustomShippingMethodOutput implements StagedOrderUpdateActionOutput { @@ -12878,6 +12874,7 @@ type SetStagedOrderShippingAddressAndCustomShippingMethodOutput implements Stage shippingRate: ShippingRate! taxCategoryResId: ResourceIdentifier externalTaxRate: ExternalTaxRateDraftOutput + custom: CustomFieldsCommand } input SetStagedOrderShippingAddressAndShippingMethod { diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodAction.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodAction.java index dff29c744cb..eea03e84f71 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodAction.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodAction.java @@ -9,6 +9,7 @@ import com.commercetools.api.models.shipping_method.ShippingRateDraft; import com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifier; +import com.commercetools.api.models.type.CustomFieldsDraft; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.*; @@ -74,6 +75,14 @@ public interface CartSetCustomShippingMethodAction extends CartUpdateAction { @JsonProperty("externalTaxRate") public ExternalTaxRateDraft getExternalTaxRate(); + /** + *

Custom Fields for the custom Shipping Method.

+ * @return custom + */ + @Valid + @JsonProperty("custom") + public CustomFieldsDraft getCustom(); + /** *

Name of the custom Shipping Method.

* @param shippingMethodName value to be set @@ -102,6 +111,13 @@ public interface CartSetCustomShippingMethodAction extends CartUpdateAction { public void setExternalTaxRate(final ExternalTaxRateDraft externalTaxRate); + /** + *

Custom Fields for the custom Shipping Method.

+ * @param custom value to be set + */ + + public void setCustom(final CustomFieldsDraft custom); + /** * factory method * @return instance of CartSetCustomShippingMethodAction @@ -121,6 +137,7 @@ public static CartSetCustomShippingMethodAction of(final CartSetCustomShippingMe instance.setShippingRate(template.getShippingRate()); instance.setTaxCategory(template.getTaxCategory()); instance.setExternalTaxRate(template.getExternalTaxRate()); + instance.setCustom(template.getCustom()); return instance; } @@ -143,6 +160,7 @@ public static CartSetCustomShippingMethodAction deepCopy( .deepCopy(template.getTaxCategory())); instance.setExternalTaxRate( com.commercetools.api.models.cart.ExternalTaxRateDraft.deepCopy(template.getExternalTaxRate())); + instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom())); return instance; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionBuilder.java index ed103de902b..e5d4b010983 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionBuilder.java @@ -35,6 +35,9 @@ public class CartSetCustomShippingMethodActionBuilder implements BuilderName of the custom Shipping Method.

* @param shippingMethodName value to be set @@ -159,6 +162,42 @@ public CartSetCustomShippingMethodActionBuilder externalTaxRate( return this; } + /** + *

Custom Fields for the custom Shipping Method.

+ * @param builder function to build the custom value + * @return Builder + */ + + public CartSetCustomShippingMethodActionBuilder custom( + Function builder) { + this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()).build(); + return this; + } + + /** + *

Custom Fields for the custom Shipping Method.

+ * @param builder function to build the custom value + * @return Builder + */ + + public CartSetCustomShippingMethodActionBuilder withCustom( + Function builder) { + this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()); + return this; + } + + /** + *

Custom Fields for the custom Shipping Method.

+ * @param custom value to be set + * @return Builder + */ + + public CartSetCustomShippingMethodActionBuilder custom( + @Nullable final com.commercetools.api.models.type.CustomFieldsDraft custom) { + this.custom = custom; + return this; + } + /** *

Name of the custom Shipping Method.

* @return shippingMethodName @@ -197,6 +236,16 @@ public com.commercetools.api.models.cart.ExternalTaxRateDraft getExternalTaxRate return this.externalTaxRate; } + /** + *

Custom Fields for the custom Shipping Method.

+ * @return custom + */ + + @Nullable + public com.commercetools.api.models.type.CustomFieldsDraft getCustom() { + return this.custom; + } + /** * builds CartSetCustomShippingMethodAction with checking for non-null required values * @return CartSetCustomShippingMethodAction @@ -205,8 +254,8 @@ public CartSetCustomShippingMethodAction build() { Objects.requireNonNull(shippingMethodName, CartSetCustomShippingMethodAction.class + ": shippingMethodName is missing"); Objects.requireNonNull(shippingRate, CartSetCustomShippingMethodAction.class + ": shippingRate is missing"); - return new CartSetCustomShippingMethodActionImpl(shippingMethodName, shippingRate, taxCategory, - externalTaxRate); + return new CartSetCustomShippingMethodActionImpl(shippingMethodName, shippingRate, taxCategory, externalTaxRate, + custom); } /** @@ -214,8 +263,8 @@ public CartSetCustomShippingMethodAction build() { * @return CartSetCustomShippingMethodAction */ public CartSetCustomShippingMethodAction buildUnchecked() { - return new CartSetCustomShippingMethodActionImpl(shippingMethodName, shippingRate, taxCategory, - externalTaxRate); + return new CartSetCustomShippingMethodActionImpl(shippingMethodName, shippingRate, taxCategory, externalTaxRate, + custom); } /** @@ -237,6 +286,7 @@ public static CartSetCustomShippingMethodActionBuilder of(final CartSetCustomShi builder.shippingRate = template.getShippingRate(); builder.taxCategory = template.getTaxCategory(); builder.externalTaxRate = template.getExternalTaxRate(); + builder.custom = template.getCustom(); return builder; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionImpl.java index 8ae9831dcaa..c61ed44ddaa 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionImpl.java @@ -33,6 +33,8 @@ public class CartSetCustomShippingMethodActionImpl implements CartSetCustomShipp private com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate; + private com.commercetools.api.models.type.CustomFieldsDraft custom; + /** * create instance with all properties */ @@ -40,11 +42,13 @@ public class CartSetCustomShippingMethodActionImpl implements CartSetCustomShipp CartSetCustomShippingMethodActionImpl(@JsonProperty("shippingMethodName") final String shippingMethodName, @JsonProperty("shippingRate") final com.commercetools.api.models.shipping_method.ShippingRateDraft shippingRate, @JsonProperty("taxCategory") final com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifier taxCategory, - @JsonProperty("externalTaxRate") final com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate) { + @JsonProperty("externalTaxRate") final com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate, + @JsonProperty("custom") final com.commercetools.api.models.type.CustomFieldsDraft custom) { this.shippingMethodName = shippingMethodName; this.shippingRate = shippingRate; this.taxCategory = taxCategory; this.externalTaxRate = externalTaxRate; + this.custom = custom; this.action = SET_CUSTOM_SHIPPING_METHOD; } @@ -95,6 +99,14 @@ public com.commercetools.api.models.cart.ExternalTaxRateDraft getExternalTaxRate return this.externalTaxRate; } + /** + *

Custom Fields for the custom Shipping Method.

+ */ + + public com.commercetools.api.models.type.CustomFieldsDraft getCustom() { + return this.custom; + } + public void setShippingMethodName(final String shippingMethodName) { this.shippingMethodName = shippingMethodName; } @@ -112,6 +124,10 @@ public void setExternalTaxRate(final com.commercetools.api.models.cart.ExternalT this.externalTaxRate = externalTaxRate; } + public void setCustom(final com.commercetools.api.models.type.CustomFieldsDraft custom) { + this.custom = custom; + } + @Override public boolean equals(Object o) { if (this == o) @@ -127,11 +143,13 @@ public boolean equals(Object o) { .append(shippingRate, that.shippingRate) .append(taxCategory, that.taxCategory) .append(externalTaxRate, that.externalTaxRate) + .append(custom, that.custom) .append(action, that.action) .append(shippingMethodName, that.shippingMethodName) .append(shippingRate, that.shippingRate) .append(taxCategory, that.taxCategory) .append(externalTaxRate, that.externalTaxRate) + .append(custom, that.custom) .isEquals(); } @@ -142,6 +160,7 @@ public int hashCode() { .append(shippingRate) .append(taxCategory) .append(externalTaxRate) + .append(custom) .toHashCode(); } @@ -152,6 +171,7 @@ public String toString() { .append("shippingRate", shippingRate) .append("taxCategory", taxCategory) .append("externalTaxRate", externalTaxRate) + .append("custom", custom) .build(); } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodAction.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodAction.java index 2d4ae123a33..c633eab8a3c 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodAction.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodAction.java @@ -11,6 +11,7 @@ import com.commercetools.api.models.order.StagedOrderUpdateAction; import com.commercetools.api.models.shipping_method.ShippingRateDraft; import com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifier; +import com.commercetools.api.models.type.CustomFieldsDraft; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.*; @@ -76,6 +77,14 @@ public interface StagedOrderSetCustomShippingMethodAction extends StagedOrderUpd @JsonProperty("externalTaxRate") public ExternalTaxRateDraft getExternalTaxRate(); + /** + *

Custom Fields for the custom Shipping Method.

+ * @return custom + */ + @Valid + @JsonProperty("custom") + public CustomFieldsDraft getCustom(); + /** *

Name of the custom Shipping Method.

* @param shippingMethodName value to be set @@ -104,6 +113,13 @@ public interface StagedOrderSetCustomShippingMethodAction extends StagedOrderUpd public void setExternalTaxRate(final ExternalTaxRateDraft externalTaxRate); + /** + *

Custom Fields for the custom Shipping Method.

+ * @param custom value to be set + */ + + public void setCustom(final CustomFieldsDraft custom); + /** * factory method * @return instance of StagedOrderSetCustomShippingMethodAction @@ -123,6 +139,7 @@ public static StagedOrderSetCustomShippingMethodAction of(final StagedOrderSetCu instance.setShippingRate(template.getShippingRate()); instance.setTaxCategory(template.getTaxCategory()); instance.setExternalTaxRate(template.getExternalTaxRate()); + instance.setCustom(template.getCustom()); return instance; } @@ -145,6 +162,7 @@ public static StagedOrderSetCustomShippingMethodAction deepCopy( .deepCopy(template.getTaxCategory())); instance.setExternalTaxRate( com.commercetools.api.models.cart.ExternalTaxRateDraft.deepCopy(template.getExternalTaxRate())); + instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom())); return instance; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionBuilder.java index 3d52afa7a05..c3ae939054c 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionBuilder.java @@ -36,6 +36,9 @@ public class StagedOrderSetCustomShippingMethodActionBuilder @Nullable private com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate; + @Nullable + private com.commercetools.api.models.type.CustomFieldsDraft custom; + /** *

Name of the custom Shipping Method.

* @param shippingMethodName value to be set @@ -160,6 +163,42 @@ public StagedOrderSetCustomShippingMethodActionBuilder externalTaxRate( return this; } + /** + *

Custom Fields for the custom Shipping Method.

+ * @param builder function to build the custom value + * @return Builder + */ + + public StagedOrderSetCustomShippingMethodActionBuilder custom( + Function builder) { + this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()).build(); + return this; + } + + /** + *

Custom Fields for the custom Shipping Method.

+ * @param builder function to build the custom value + * @return Builder + */ + + public StagedOrderSetCustomShippingMethodActionBuilder withCustom( + Function builder) { + this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()); + return this; + } + + /** + *

Custom Fields for the custom Shipping Method.

+ * @param custom value to be set + * @return Builder + */ + + public StagedOrderSetCustomShippingMethodActionBuilder custom( + @Nullable final com.commercetools.api.models.type.CustomFieldsDraft custom) { + this.custom = custom; + return this; + } + /** *

Name of the custom Shipping Method.

* @return shippingMethodName @@ -198,6 +237,16 @@ public com.commercetools.api.models.cart.ExternalTaxRateDraft getExternalTaxRate return this.externalTaxRate; } + /** + *

Custom Fields for the custom Shipping Method.

+ * @return custom + */ + + @Nullable + public com.commercetools.api.models.type.CustomFieldsDraft getCustom() { + return this.custom; + } + /** * builds StagedOrderSetCustomShippingMethodAction with checking for non-null required values * @return StagedOrderSetCustomShippingMethodAction @@ -208,7 +257,7 @@ public StagedOrderSetCustomShippingMethodAction build() { Objects.requireNonNull(shippingRate, StagedOrderSetCustomShippingMethodAction.class + ": shippingRate is missing"); return new StagedOrderSetCustomShippingMethodActionImpl(shippingMethodName, shippingRate, taxCategory, - externalTaxRate); + externalTaxRate, custom); } /** @@ -217,7 +266,7 @@ public StagedOrderSetCustomShippingMethodAction build() { */ public StagedOrderSetCustomShippingMethodAction buildUnchecked() { return new StagedOrderSetCustomShippingMethodActionImpl(shippingMethodName, shippingRate, taxCategory, - externalTaxRate); + externalTaxRate, custom); } /** @@ -240,6 +289,7 @@ public static StagedOrderSetCustomShippingMethodActionBuilder of( builder.shippingRate = template.getShippingRate(); builder.taxCategory = template.getTaxCategory(); builder.externalTaxRate = template.getExternalTaxRate(); + builder.custom = template.getCustom(); return builder; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionImpl.java index 25751a34d4a..fcd6d11e70b 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionImpl.java @@ -34,6 +34,8 @@ public class StagedOrderSetCustomShippingMethodActionImpl private com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate; + private com.commercetools.api.models.type.CustomFieldsDraft custom; + /** * create instance with all properties */ @@ -41,11 +43,13 @@ public class StagedOrderSetCustomShippingMethodActionImpl StagedOrderSetCustomShippingMethodActionImpl(@JsonProperty("shippingMethodName") final String shippingMethodName, @JsonProperty("shippingRate") final com.commercetools.api.models.shipping_method.ShippingRateDraft shippingRate, @JsonProperty("taxCategory") final com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifier taxCategory, - @JsonProperty("externalTaxRate") final com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate) { + @JsonProperty("externalTaxRate") final com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate, + @JsonProperty("custom") final com.commercetools.api.models.type.CustomFieldsDraft custom) { this.shippingMethodName = shippingMethodName; this.shippingRate = shippingRate; this.taxCategory = taxCategory; this.externalTaxRate = externalTaxRate; + this.custom = custom; this.action = SET_CUSTOM_SHIPPING_METHOD; } @@ -96,6 +100,14 @@ public com.commercetools.api.models.cart.ExternalTaxRateDraft getExternalTaxRate return this.externalTaxRate; } + /** + *

Custom Fields for the custom Shipping Method.

+ */ + + public com.commercetools.api.models.type.CustomFieldsDraft getCustom() { + return this.custom; + } + public void setShippingMethodName(final String shippingMethodName) { this.shippingMethodName = shippingMethodName; } @@ -113,6 +125,10 @@ public void setExternalTaxRate(final com.commercetools.api.models.cart.ExternalT this.externalTaxRate = externalTaxRate; } + public void setCustom(final com.commercetools.api.models.type.CustomFieldsDraft custom) { + this.custom = custom; + } + @Override public boolean equals(Object o) { if (this == o) @@ -128,11 +144,13 @@ public boolean equals(Object o) { .append(shippingRate, that.shippingRate) .append(taxCategory, that.taxCategory) .append(externalTaxRate, that.externalTaxRate) + .append(custom, that.custom) .append(action, that.action) .append(shippingMethodName, that.shippingMethodName) .append(shippingRate, that.shippingRate) .append(taxCategory, that.taxCategory) .append(externalTaxRate, that.externalTaxRate) + .append(custom, that.custom) .isEquals(); } @@ -143,6 +161,7 @@ public int hashCode() { .append(shippingRate) .append(taxCategory) .append(externalTaxRate) + .append(custom) .toHashCode(); } @@ -153,6 +172,7 @@ public String toString() { .append("shippingRate", shippingRate) .append("taxCategory", taxCategory) .append("externalTaxRate", externalTaxRate) + .append("custom", custom) .build(); } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodAction.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodAction.java index d13fd0b0ae7..4e63a74b09c 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodAction.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodAction.java @@ -12,6 +12,7 @@ import com.commercetools.api.models.order.StagedOrderUpdateAction; import com.commercetools.api.models.shipping_method.ShippingRateDraft; import com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifier; +import com.commercetools.api.models.type.CustomFieldsDraft; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.*; @@ -86,6 +87,14 @@ public interface StagedOrderSetShippingAddressAndCustomShippingMethodAction exte @JsonProperty("externalTaxRate") public ExternalTaxRateDraft getExternalTaxRate(); + /** + *

Custom Fields for the custom Shipping Method.

+ * @return custom + */ + @Valid + @JsonProperty("custom") + public CustomFieldsDraft getCustom(); + /** *

Value to set for shippingAddress.

* @param address value to be set @@ -121,6 +130,13 @@ public interface StagedOrderSetShippingAddressAndCustomShippingMethodAction exte public void setExternalTaxRate(final ExternalTaxRateDraft externalTaxRate); + /** + *

Custom Fields for the custom Shipping Method.

+ * @param custom value to be set + */ + + public void setCustom(final CustomFieldsDraft custom); + /** * factory method * @return instance of StagedOrderSetShippingAddressAndCustomShippingMethodAction @@ -142,6 +158,7 @@ public static StagedOrderSetShippingAddressAndCustomShippingMethodAction of( instance.setShippingRate(template.getShippingRate()); instance.setTaxCategory(template.getTaxCategory()); instance.setExternalTaxRate(template.getExternalTaxRate()); + instance.setCustom(template.getCustom()); return instance; } @@ -165,6 +182,7 @@ public static StagedOrderSetShippingAddressAndCustomShippingMethodAction deepCop .deepCopy(template.getTaxCategory())); instance.setExternalTaxRate( com.commercetools.api.models.cart.ExternalTaxRateDraft.deepCopy(template.getExternalTaxRate())); + instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom())); return instance; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder.java index e46102c31fd..136389b0bc8 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder.java @@ -39,6 +39,9 @@ public class StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder @Nullable private com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate; + @Nullable + private com.commercetools.api.models.type.CustomFieldsDraft custom; + /** *

Value to set for shippingAddress.

* @param builder function to build the address value @@ -200,6 +203,42 @@ public StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder externa return this; } + /** + *

Custom Fields for the custom Shipping Method.

+ * @param builder function to build the custom value + * @return Builder + */ + + public StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder custom( + Function builder) { + this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()).build(); + return this; + } + + /** + *

Custom Fields for the custom Shipping Method.

+ * @param builder function to build the custom value + * @return Builder + */ + + public StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder withCustom( + Function builder) { + this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()); + return this; + } + + /** + *

Custom Fields for the custom Shipping Method.

+ * @param custom value to be set + * @return Builder + */ + + public StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder custom( + @Nullable final com.commercetools.api.models.type.CustomFieldsDraft custom) { + this.custom = custom; + return this; + } + /** *

Value to set for shippingAddress.

* @return address @@ -247,6 +286,16 @@ public com.commercetools.api.models.cart.ExternalTaxRateDraft getExternalTaxRate return this.externalTaxRate; } + /** + *

Custom Fields for the custom Shipping Method.

+ * @return custom + */ + + @Nullable + public com.commercetools.api.models.type.CustomFieldsDraft getCustom() { + return this.custom; + } + /** * builds StagedOrderSetShippingAddressAndCustomShippingMethodAction with checking for non-null required values * @return StagedOrderSetShippingAddressAndCustomShippingMethodAction @@ -259,7 +308,7 @@ public StagedOrderSetShippingAddressAndCustomShippingMethodAction build() { Objects.requireNonNull(shippingRate, StagedOrderSetShippingAddressAndCustomShippingMethodAction.class + ": shippingRate is missing"); return new StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl(address, shippingMethodName, - shippingRate, taxCategory, externalTaxRate); + shippingRate, taxCategory, externalTaxRate, custom); } /** @@ -268,7 +317,7 @@ public StagedOrderSetShippingAddressAndCustomShippingMethodAction build() { */ public StagedOrderSetShippingAddressAndCustomShippingMethodAction buildUnchecked() { return new StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl(address, shippingMethodName, - shippingRate, taxCategory, externalTaxRate); + shippingRate, taxCategory, externalTaxRate, custom); } /** @@ -292,6 +341,7 @@ public static StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder builder.shippingRate = template.getShippingRate(); builder.taxCategory = template.getTaxCategory(); builder.externalTaxRate = template.getExternalTaxRate(); + builder.custom = template.getCustom(); return builder; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl.java index 6a30f0145eb..9b318c9b4ce 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl.java @@ -35,6 +35,8 @@ public class StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl private com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate; + private com.commercetools.api.models.type.CustomFieldsDraft custom; + /** * create instance with all properties */ @@ -44,12 +46,14 @@ public class StagedOrderSetShippingAddressAndCustomShippingMethodActionImpl @JsonProperty("shippingMethodName") final String shippingMethodName, @JsonProperty("shippingRate") final com.commercetools.api.models.shipping_method.ShippingRateDraft shippingRate, @JsonProperty("taxCategory") final com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifier taxCategory, - @JsonProperty("externalTaxRate") final com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate) { + @JsonProperty("externalTaxRate") final com.commercetools.api.models.cart.ExternalTaxRateDraft externalTaxRate, + @JsonProperty("custom") final com.commercetools.api.models.type.CustomFieldsDraft custom) { this.address = address; this.shippingMethodName = shippingMethodName; this.shippingRate = shippingRate; this.taxCategory = taxCategory; this.externalTaxRate = externalTaxRate; + this.custom = custom; this.action = SET_SHIPPING_ADDRESS_AND_CUSTOM_SHIPPING_METHOD; } @@ -108,6 +112,14 @@ public com.commercetools.api.models.cart.ExternalTaxRateDraft getExternalTaxRate return this.externalTaxRate; } + /** + *

Custom Fields for the custom Shipping Method.

+ */ + + public com.commercetools.api.models.type.CustomFieldsDraft getCustom() { + return this.custom; + } + public void setAddress(final com.commercetools.api.models.common.BaseAddress address) { this.address = address; } @@ -129,6 +141,10 @@ public void setExternalTaxRate(final com.commercetools.api.models.cart.ExternalT this.externalTaxRate = externalTaxRate; } + public void setCustom(final com.commercetools.api.models.type.CustomFieldsDraft custom) { + this.custom = custom; + } + @Override public boolean equals(Object o) { if (this == o) @@ -145,12 +161,14 @@ public boolean equals(Object o) { .append(shippingRate, that.shippingRate) .append(taxCategory, that.taxCategory) .append(externalTaxRate, that.externalTaxRate) + .append(custom, that.custom) .append(action, that.action) .append(address, that.address) .append(shippingMethodName, that.shippingMethodName) .append(shippingRate, that.shippingRate) .append(taxCategory, that.taxCategory) .append(externalTaxRate, that.externalTaxRate) + .append(custom, that.custom) .isEquals(); } @@ -162,6 +180,7 @@ public int hashCode() { .append(shippingRate) .append(taxCategory) .append(externalTaxRate) + .append(custom) .toHashCode(); } @@ -173,6 +192,7 @@ public String toString() { .append("shippingRate", shippingRate) .append("taxCategory", taxCategory) .append("externalTaxRate", externalTaxRate) + .append("custom", custom) .build(); } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/CartSetCustomShippingMethodActionQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/CartSetCustomShippingMethodActionQueryBuilderDsl.java index 63910130860..09a5213081a 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/CartSetCustomShippingMethodActionQueryBuilderDsl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/cart/CartSetCustomShippingMethodActionQueryBuilderDsl.java @@ -53,4 +53,13 @@ public CombinationQueryPredicate custom( + Function> fn) { + return new CombinationQueryPredicate<>( + ContainerQueryPredicate.of() + .parent(ConstantQueryPredicate.of().constant("custom")) + .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl.of())), + CartSetCustomShippingMethodActionQueryBuilderDsl::of); + } + } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetCustomShippingMethodActionQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetCustomShippingMethodActionQueryBuilderDsl.java index f97abe3692e..f9e55e13747 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetCustomShippingMethodActionQueryBuilderDsl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetCustomShippingMethodActionQueryBuilderDsl.java @@ -53,4 +53,13 @@ public CombinationQueryPredicate custom( + Function> fn) { + return new CombinationQueryPredicate<>( + ContainerQueryPredicate.of() + .parent(ConstantQueryPredicate.of().constant("custom")) + .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl.of())), + StagedOrderSetCustomShippingMethodActionQueryBuilderDsl::of); + } + } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionQueryBuilderDsl.java index 5a39c4b200e..73aef7840ed 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionQueryBuilderDsl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionQueryBuilderDsl.java @@ -64,4 +64,13 @@ public CombinationQueryPredicate custom( + Function> fn) { + return new CombinationQueryPredicate<>( + ContainerQueryPredicate.of() + .parent(ConstantQueryPredicate.of().constant("custom")) + .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl.of())), + StagedOrderSetShippingAddressAndCustomShippingMethodActionQueryBuilderDsl::of); + } + } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java index 0c680c3fc8c..a94a4ccec1d 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java @@ -32,7 +32,9 @@ public static Object[][] objectBuilder() { .taxCategory( new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) }, new Object[] { CartSetCustomShippingMethodAction.builder() - .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } }; + .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) }, + new Object[] { CartSetCustomShippingMethodAction.builder() + .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } }; } @Test @@ -65,4 +67,12 @@ public void externalTaxRate() { Assertions.assertThat(value.getExternalTaxRate()) .isEqualTo(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()); } + + @Test + public void custom() { + CartSetCustomShippingMethodAction value = CartSetCustomShippingMethodAction.of(); + value.setCustom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()); + Assertions.assertThat(value.getCustom()) + .isEqualTo(new com.commercetools.api.models.type.CustomFieldsDraftImpl()); + } } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java index 0f6d6853c3f..594bc625104 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java @@ -34,7 +34,9 @@ public static Object[][] objectBuilder() { .taxCategory( new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) }, new Object[] { StagedOrderSetCustomShippingMethodAction.builder() - .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } }; + .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) }, + new Object[] { StagedOrderSetCustomShippingMethodAction.builder() + .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } }; } @Test @@ -67,4 +69,12 @@ public void externalTaxRate() { Assertions.assertThat(value.getExternalTaxRate()) .isEqualTo(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()); } + + @Test + public void custom() { + StagedOrderSetCustomShippingMethodAction value = StagedOrderSetCustomShippingMethodAction.of(); + value.setCustom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()); + Assertions.assertThat(value.getCustom()) + .isEqualTo(new com.commercetools.api.models.type.CustomFieldsDraftImpl()); + } } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java index d772f693caa..6f826482133 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java @@ -37,7 +37,9 @@ public static Object[][] objectBuilder() { .taxCategory( new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) }, new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder() - .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } }; + .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) }, + new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder() + .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } }; } @Test @@ -82,4 +84,13 @@ public void externalTaxRate() { Assertions.assertThat(value.getExternalTaxRate()) .isEqualTo(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()); } + + @Test + public void custom() { + StagedOrderSetShippingAddressAndCustomShippingMethodAction value = StagedOrderSetShippingAddressAndCustomShippingMethodAction + .of(); + value.setCustom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()); + Assertions.assertThat(value.getCustom()) + .isEqualTo(new com.commercetools.api.models.type.CustomFieldsDraftImpl()); + } } diff --git a/references.txt b/references.txt index e09135814fa..ed4cade1e79 100644 --- a/references.txt +++ b/references.txt @@ -345,3 +345,5 @@ f4f3c42381257c319000e05bd5b61074d18b0a5f 9066fb1012d20a92037e102e18a6295bdbcb82e3 4025ec42d633ae6b77320e24f6244d9dce608e6e 7abe530c4e76020a59ffb61623f20b87ae406e02 +62496134db5ebaf04225ce024b1f5ed3f2c79557 +55ee33c4d18af345c4e89be226286c56c187a878