Skip to content

Commit a248061

Browse files
Merge pull request #759 from commercetools/gen-sdk-updates
Update generated SDKs
2 parents fa7ebe0 + b95d128 commit a248061

File tree

11 files changed

+72
-42
lines changed

11 files changed

+72
-42
lines changed

changes.md

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
- :warning: changed property `line` of type `GraphQLErrorLocation` from type `integer` to `number`
77
- :warning: changed property `column` of type `GraphQLErrorLocation` from type `integer` to `number`
8+
- :warning: changed property `totalPrice` of type `StagedOrder` from type `TypedMoney` to `CentPrecisionMoney`
9+
- :warning: changed property `totalPrice` of type `Order` from type `TypedMoney` to `CentPrecisionMoney`
810
</details>
911

1012

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/Order.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import com.commercetools.api.models.cart_discount.CartDiscountReference;
3030
import com.commercetools.api.models.common.Address;
3131
import com.commercetools.api.models.common.BaseResource;
32+
import com.commercetools.api.models.common.CentPrecisionMoney;
3233
import com.commercetools.api.models.common.CreatedBy;
3334
import com.commercetools.api.models.common.LastModifiedBy;
34-
import com.commercetools.api.models.common.TypedMoney;
3535
import com.commercetools.api.models.customer_group.CustomerGroupReference;
3636
import com.commercetools.api.models.quote.QuoteReference;
3737
import com.commercetools.api.models.state.StateReference;
@@ -183,7 +183,7 @@ public interface Order extends BaseResource, OrderMixin, com.commercetools.api.m
183183
@NotNull
184184
@Valid
185185
@JsonProperty("totalPrice")
186-
public TypedMoney getTotalPrice();
186+
public CentPrecisionMoney getTotalPrice();
187187

188188
/**
189189
* <ul>
@@ -608,7 +608,7 @@ public interface Order extends BaseResource, OrderMixin, com.commercetools.api.m
608608
* @param totalPrice value to be set
609609
*/
610610

611-
public void setTotalPrice(final TypedMoney totalPrice);
611+
public void setTotalPrice(final CentPrecisionMoney totalPrice);
612612

613613
/**
614614
* <ul>
@@ -1049,7 +1049,8 @@ public static Order deepCopy(@Nullable final Order template) {
10491049
.map(com.commercetools.api.models.cart.CustomLineItem::deepCopy)
10501050
.collect(Collectors.toList()))
10511051
.orElse(null));
1052-
instance.setTotalPrice(com.commercetools.api.models.common.TypedMoney.deepCopy(template.getTotalPrice()));
1052+
instance.setTotalPrice(
1053+
com.commercetools.api.models.common.CentPrecisionMoney.deepCopy(template.getTotalPrice()));
10531054
instance.setTaxedPrice(com.commercetools.api.models.cart.TaxedPrice.deepCopy(template.getTaxedPrice()));
10541055
instance.setTaxedShippingPrice(
10551056
com.commercetools.api.models.cart.TaxedPrice.deepCopy(template.getTaxedShippingPrice()));

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/OrderBuilder.java

+21-8
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class OrderBuilder implements Builder<Order> {
7272

7373
private java.util.List<com.commercetools.api.models.cart.CustomLineItem> customLineItems;
7474

75-
private com.commercetools.api.models.common.TypedMoney totalPrice;
75+
private com.commercetools.api.models.common.CentPrecisionMoney totalPrice;
7676

7777
@Nullable
7878
private com.commercetools.api.models.cart.TaxedPrice taxedPrice;
@@ -566,12 +566,13 @@ public OrderBuilder setCustomLineItems(
566566
/**
567567
* <p>Sum of the <code>totalPrice</code> field of all LineItems and CustomLineItems, and if available, the <code>price</code> field of ShippingInfo. If a discount applies on <code>totalPrice</code>, this field holds the discounted value.</p>
568568
* <p>Taxes are included if TaxRate <code>includedInPrice</code> is <code>true</code> for each price.</p>
569-
* @param totalPrice value to be set
569+
* @param builder function to build the totalPrice value
570570
* @return Builder
571571
*/
572572

573-
public OrderBuilder totalPrice(final com.commercetools.api.models.common.TypedMoney totalPrice) {
574-
this.totalPrice = totalPrice;
573+
public OrderBuilder totalPrice(
574+
Function<com.commercetools.api.models.common.CentPrecisionMoneyBuilder, com.commercetools.api.models.common.CentPrecisionMoneyBuilder> builder) {
575+
this.totalPrice = builder.apply(com.commercetools.api.models.common.CentPrecisionMoneyBuilder.of()).build();
575576
return this;
576577
}
577578

@@ -582,9 +583,21 @@ public OrderBuilder totalPrice(final com.commercetools.api.models.common.TypedMo
582583
* @return Builder
583584
*/
584585

585-
public OrderBuilder totalPrice(
586-
Function<com.commercetools.api.models.common.TypedMoneyBuilder, Builder<? extends com.commercetools.api.models.common.TypedMoney>> builder) {
587-
this.totalPrice = builder.apply(com.commercetools.api.models.common.TypedMoneyBuilder.of()).build();
586+
public OrderBuilder withTotalPrice(
587+
Function<com.commercetools.api.models.common.CentPrecisionMoneyBuilder, com.commercetools.api.models.common.CentPrecisionMoney> builder) {
588+
this.totalPrice = builder.apply(com.commercetools.api.models.common.CentPrecisionMoneyBuilder.of());
589+
return this;
590+
}
591+
592+
/**
593+
* <p>Sum of the <code>totalPrice</code> field of all LineItems and CustomLineItems, and if available, the <code>price</code> field of ShippingInfo. If a discount applies on <code>totalPrice</code>, this field holds the discounted value.</p>
594+
* <p>Taxes are included if TaxRate <code>includedInPrice</code> is <code>true</code> for each price.</p>
595+
* @param totalPrice value to be set
596+
* @return Builder
597+
*/
598+
599+
public OrderBuilder totalPrice(final com.commercetools.api.models.common.CentPrecisionMoney totalPrice) {
600+
this.totalPrice = totalPrice;
588601
return this;
589602
}
590603

@@ -2045,7 +2058,7 @@ public java.util.List<com.commercetools.api.models.cart.CustomLineItem> getCusto
20452058
* @return totalPrice
20462059
*/
20472060

2048-
public com.commercetools.api.models.common.TypedMoney getTotalPrice() {
2061+
public com.commercetools.api.models.common.CentPrecisionMoney getTotalPrice() {
20492062
return this.totalPrice;
20502063
}
20512064

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/OrderImpl.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class OrderImpl implements Order, ModelBase {
5050

5151
private java.util.List<com.commercetools.api.models.cart.CustomLineItem> customLineItems;
5252

53-
private com.commercetools.api.models.common.TypedMoney totalPrice;
53+
private com.commercetools.api.models.common.CentPrecisionMoney totalPrice;
5454

5555
private com.commercetools.api.models.cart.TaxedPrice taxedPrice;
5656

@@ -142,7 +142,7 @@ public class OrderImpl implements Order, ModelBase {
142142
@JsonProperty("store") final com.commercetools.api.models.store.StoreKeyReference store,
143143
@JsonProperty("lineItems") final java.util.List<com.commercetools.api.models.cart.LineItem> lineItems,
144144
@JsonProperty("customLineItems") final java.util.List<com.commercetools.api.models.cart.CustomLineItem> customLineItems,
145-
@JsonProperty("totalPrice") final com.commercetools.api.models.common.TypedMoney totalPrice,
145+
@JsonProperty("totalPrice") final com.commercetools.api.models.common.CentPrecisionMoney totalPrice,
146146
@JsonProperty("taxedPrice") final com.commercetools.api.models.cart.TaxedPrice taxedPrice,
147147
@JsonProperty("taxedShippingPrice") final com.commercetools.api.models.cart.TaxedPrice taxedShippingPrice,
148148
@JsonProperty("discountOnTotalPrice") final com.commercetools.api.models.cart.DiscountOnTotalPrice discountOnTotalPrice,
@@ -355,7 +355,7 @@ public java.util.List<com.commercetools.api.models.cart.CustomLineItem> getCusto
355355
* <p>Taxes are included if TaxRate <code>includedInPrice</code> is <code>true</code> for each price.</p>
356356
*/
357357

358-
public com.commercetools.api.models.common.TypedMoney getTotalPrice() {
358+
public com.commercetools.api.models.common.CentPrecisionMoney getTotalPrice() {
359359
return this.totalPrice;
360360
}
361361

@@ -723,7 +723,7 @@ public void setCustomLineItems(
723723
this.customLineItems = customLineItems;
724724
}
725725

726-
public void setTotalPrice(final com.commercetools.api.models.common.TypedMoney totalPrice) {
726+
public void setTotalPrice(final com.commercetools.api.models.common.CentPrecisionMoney totalPrice) {
727727
this.totalPrice = totalPrice;
728728
}
729729

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ public static StagedOrder deepCopy(@Nullable final StagedOrder template) {
147147
.map(com.commercetools.api.models.cart.CustomLineItem::deepCopy)
148148
.collect(Collectors.toList()))
149149
.orElse(null));
150-
instance.setTotalPrice(com.commercetools.api.models.common.TypedMoney.deepCopy(template.getTotalPrice()));
150+
instance.setTotalPrice(
151+
com.commercetools.api.models.common.CentPrecisionMoney.deepCopy(template.getTotalPrice()));
151152
instance.setTaxedPrice(com.commercetools.api.models.cart.TaxedPrice.deepCopy(template.getTaxedPrice()));
152153
instance.setTaxedShippingPrice(
153154
com.commercetools.api.models.cart.TaxedPrice.deepCopy(template.getTaxedShippingPrice()));

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderBuilder.java

+21-8
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class StagedOrderBuilder implements Builder<StagedOrder> {
7272

7373
private java.util.List<com.commercetools.api.models.cart.CustomLineItem> customLineItems;
7474

75-
private com.commercetools.api.models.common.TypedMoney totalPrice;
75+
private com.commercetools.api.models.common.CentPrecisionMoney totalPrice;
7676

7777
@Nullable
7878
private com.commercetools.api.models.cart.TaxedPrice taxedPrice;
@@ -568,12 +568,13 @@ public StagedOrderBuilder setCustomLineItems(
568568
/**
569569
* <p>Sum of the <code>totalPrice</code> field of all LineItems and CustomLineItems, and if available, the <code>price</code> field of ShippingInfo. If a discount applies on <code>totalPrice</code>, this field holds the discounted value.</p>
570570
* <p>Taxes are included if TaxRate <code>includedInPrice</code> is <code>true</code> for each price.</p>
571-
* @param totalPrice value to be set
571+
* @param builder function to build the totalPrice value
572572
* @return Builder
573573
*/
574574

575-
public StagedOrderBuilder totalPrice(final com.commercetools.api.models.common.TypedMoney totalPrice) {
576-
this.totalPrice = totalPrice;
575+
public StagedOrderBuilder totalPrice(
576+
Function<com.commercetools.api.models.common.CentPrecisionMoneyBuilder, com.commercetools.api.models.common.CentPrecisionMoneyBuilder> builder) {
577+
this.totalPrice = builder.apply(com.commercetools.api.models.common.CentPrecisionMoneyBuilder.of()).build();
577578
return this;
578579
}
579580

@@ -584,9 +585,21 @@ public StagedOrderBuilder totalPrice(final com.commercetools.api.models.common.T
584585
* @return Builder
585586
*/
586587

587-
public StagedOrderBuilder totalPrice(
588-
Function<com.commercetools.api.models.common.TypedMoneyBuilder, Builder<? extends com.commercetools.api.models.common.TypedMoney>> builder) {
589-
this.totalPrice = builder.apply(com.commercetools.api.models.common.TypedMoneyBuilder.of()).build();
588+
public StagedOrderBuilder withTotalPrice(
589+
Function<com.commercetools.api.models.common.CentPrecisionMoneyBuilder, com.commercetools.api.models.common.CentPrecisionMoney> builder) {
590+
this.totalPrice = builder.apply(com.commercetools.api.models.common.CentPrecisionMoneyBuilder.of());
591+
return this;
592+
}
593+
594+
/**
595+
* <p>Sum of the <code>totalPrice</code> field of all LineItems and CustomLineItems, and if available, the <code>price</code> field of ShippingInfo. If a discount applies on <code>totalPrice</code>, this field holds the discounted value.</p>
596+
* <p>Taxes are included if TaxRate <code>includedInPrice</code> is <code>true</code> for each price.</p>
597+
* @param totalPrice value to be set
598+
* @return Builder
599+
*/
600+
601+
public StagedOrderBuilder totalPrice(final com.commercetools.api.models.common.CentPrecisionMoney totalPrice) {
602+
this.totalPrice = totalPrice;
590603
return this;
591604
}
592605

@@ -2054,7 +2067,7 @@ public java.util.List<com.commercetools.api.models.cart.CustomLineItem> getCusto
20542067
* @return totalPrice
20552068
*/
20562069

2057-
public com.commercetools.api.models.common.TypedMoney getTotalPrice() {
2070+
public com.commercetools.api.models.common.CentPrecisionMoney getTotalPrice() {
20582071
return this.totalPrice;
20592072
}
20602073

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order_edit/StagedOrderImpl.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class StagedOrderImpl implements StagedOrder, ModelBase {
5050

5151
private java.util.List<com.commercetools.api.models.cart.CustomLineItem> customLineItems;
5252

53-
private com.commercetools.api.models.common.TypedMoney totalPrice;
53+
private com.commercetools.api.models.common.CentPrecisionMoney totalPrice;
5454

5555
private com.commercetools.api.models.cart.TaxedPrice taxedPrice;
5656

@@ -142,7 +142,7 @@ public class StagedOrderImpl implements StagedOrder, ModelBase {
142142
@JsonProperty("store") final com.commercetools.api.models.store.StoreKeyReference store,
143143
@JsonProperty("lineItems") final java.util.List<com.commercetools.api.models.cart.LineItem> lineItems,
144144
@JsonProperty("customLineItems") final java.util.List<com.commercetools.api.models.cart.CustomLineItem> customLineItems,
145-
@JsonProperty("totalPrice") final com.commercetools.api.models.common.TypedMoney totalPrice,
145+
@JsonProperty("totalPrice") final com.commercetools.api.models.common.CentPrecisionMoney totalPrice,
146146
@JsonProperty("taxedPrice") final com.commercetools.api.models.cart.TaxedPrice taxedPrice,
147147
@JsonProperty("taxedShippingPrice") final com.commercetools.api.models.cart.TaxedPrice taxedShippingPrice,
148148
@JsonProperty("discountOnTotalPrice") final com.commercetools.api.models.cart.DiscountOnTotalPrice discountOnTotalPrice,
@@ -355,7 +355,7 @@ public java.util.List<com.commercetools.api.models.cart.CustomLineItem> getCusto
355355
* <p>Taxes are included if TaxRate <code>includedInPrice</code> is <code>true</code> for each price.</p>
356356
*/
357357

358-
public com.commercetools.api.models.common.TypedMoney getTotalPrice() {
358+
public com.commercetools.api.models.common.CentPrecisionMoney getTotalPrice() {
359359
return this.totalPrice;
360360
}
361361

@@ -723,7 +723,7 @@ public void setCustomLineItems(
723723
this.customLineItems = customLineItems;
724724
}
725725

726-
public void setTotalPrice(final com.commercetools.api.models.common.TypedMoney totalPrice) {
726+
public void setTotalPrice(final com.commercetools.api.models.common.CentPrecisionMoney totalPrice) {
727727
this.totalPrice = totalPrice;
728728
}
729729

commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order/OrderQueryBuilderDsl.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ public CollectionPredicateBuilder<OrderQueryBuilderDsl> customLineItems() {
122122
}
123123

124124
public CombinationQueryPredicate<OrderQueryBuilderDsl> totalPrice(
125-
Function<com.commercetools.api.predicates.query.common.TypedMoneyQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.common.TypedMoneyQueryBuilderDsl>> fn) {
126-
return new CombinationQueryPredicate<>(
127-
ContainerQueryPredicate.of()
128-
.parent(ConstantQueryPredicate.of().constant("totalPrice"))
129-
.inner(fn.apply(com.commercetools.api.predicates.query.common.TypedMoneyQueryBuilderDsl.of())),
125+
Function<com.commercetools.api.predicates.query.common.CentPrecisionMoneyQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.common.CentPrecisionMoneyQueryBuilderDsl>> fn) {
126+
return new CombinationQueryPredicate<>(ContainerQueryPredicate.of()
127+
.parent(ConstantQueryPredicate.of().constant("totalPrice"))
128+
.inner(fn.apply(com.commercetools.api.predicates.query.common.CentPrecisionMoneyQueryBuilderDsl.of())),
130129
OrderQueryBuilderDsl::of);
131130
}
132131

commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/order_edit/StagedOrderQueryBuilderDsl.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ public CollectionPredicateBuilder<StagedOrderQueryBuilderDsl> customLineItems()
122122
}
123123

124124
public CombinationQueryPredicate<StagedOrderQueryBuilderDsl> totalPrice(
125-
Function<com.commercetools.api.predicates.query.common.TypedMoneyQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.common.TypedMoneyQueryBuilderDsl>> fn) {
126-
return new CombinationQueryPredicate<>(
127-
ContainerQueryPredicate.of()
128-
.parent(ConstantQueryPredicate.of().constant("totalPrice"))
129-
.inner(fn.apply(com.commercetools.api.predicates.query.common.TypedMoneyQueryBuilderDsl.of())),
125+
Function<com.commercetools.api.predicates.query.common.CentPrecisionMoneyQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.common.CentPrecisionMoneyQueryBuilderDsl>> fn) {
126+
return new CombinationQueryPredicate<>(ContainerQueryPredicate.of()
127+
.parent(ConstantQueryPredicate.of().constant("totalPrice"))
128+
.inner(fn.apply(com.commercetools.api.predicates.query.common.CentPrecisionMoneyQueryBuilderDsl.of())),
130129
StagedOrderQueryBuilderDsl::of);
131130
}
132131

commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public static Object[][] objectBuilder() {
4444
Order.builder()
4545
.customLineItems(Collections
4646
.singletonList(new com.commercetools.api.models.cart.CustomLineItemImpl())) },
47-
new Object[] { Order.builder().totalPrice(new com.commercetools.api.models.common.TypedMoneyImpl()) },
47+
new Object[] {
48+
Order.builder().totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
4849
new Object[] { Order.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
4950
new Object[] {
5051
Order.builder().taxedShippingPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
@@ -206,9 +207,9 @@ public void customLineItems() {
206207
@Test
207208
public void totalPrice() {
208209
Order value = Order.of();
209-
value.setTotalPrice(new com.commercetools.api.models.common.TypedMoneyImpl());
210+
value.setTotalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl());
210211
Assertions.assertThat(value.getTotalPrice())
211-
.isEqualTo(new com.commercetools.api.models.common.TypedMoneyImpl());
212+
.isEqualTo(new com.commercetools.api.models.common.CentPrecisionMoneyImpl());
212213
}
213214

214215
@Test

references.txt

+1
Original file line numberDiff line numberDiff line change
@@ -332,3 +332,4 @@ f254d17f05343dcc4299fc53ff9b335b5ef63d69
332332
a639dbb1cfe5b434c350e7b47ca717c69b3aa369
333333
6a8624fb41168a6a78ac836b7208c2790a686608
334334
971c1b4ce06c29fcb8c2402dc2ca523b2907352c
335+
b747e1fa4f246b748a89bccbfd8a43f5b6f51175

0 commit comments

Comments
 (0)