diff --git a/doc/models/fulfillment.md b/doc/models/fulfillment.md index 6ac22ca6..0c2f8c1e 100644 --- a/doc/models/fulfillment.md +++ b/doc/models/fulfillment.md @@ -22,7 +22,6 @@ However, orders returned by the Orders API might contain multiple fulfillments b | `PickupDetails` | [`FulfillmentPickupDetails`](../../doc/models/fulfillment-pickup-details.md) | Optional | Contains details necessary to fulfill a pickup order. | FulfillmentPickupDetails getPickupDetails() | | `ShipmentDetails` | [`FulfillmentShipmentDetails`](../../doc/models/fulfillment-shipment-details.md) | Optional | Contains the details necessary to fulfill a shipment order. | FulfillmentShipmentDetails getShipmentDetails() | | `DeliveryDetails` | [`FulfillmentDeliveryDetails`](../../doc/models/fulfillment-delivery-details.md) | Optional | Describes delivery details of an order fulfillment. | FulfillmentDeliveryDetails getDeliveryDetails() | -| `Version` | `Integer` | Optional | The version number attributed to the fulfillment and incremented every time there is a
fulfillment-related update. The fulfillment version is an internal field only for use
between Orders and the Fulfillment service. | Integer getVersion() | ## Example (as JSON) diff --git a/doc/models/order-return-service-charge.md b/doc/models/order-return-service-charge.md index 55237031..01ed91f2 100644 --- a/doc/models/order-return-service-charge.md +++ b/doc/models/order-return-service-charge.md @@ -26,8 +26,6 @@ Represents the service charge applied to the original order. | `AppliedTaxes` | [`List`](../../doc/models/order-line-item-applied-tax.md) | Optional | The list of references to `OrderReturnTax` entities applied to the
`OrderReturnServiceCharge`. Each `OrderLineItemAppliedTax` has a `tax_uid`
that references the `uid` of a top-level `OrderReturnTax` that is being
applied to the `OrderReturnServiceCharge`. On reads, the applied amount is
populated. | List getAppliedTaxes() | | `TreatmentType` | [`String`](../../doc/models/order-service-charge-treatment-type.md) | Optional | Indicates whether the service charge will be treated as a value-holding line item or
apportioned toward a line item. | String getTreatmentType() | | `Scope` | [`String`](../../doc/models/order-service-charge-scope.md) | Optional | Indicates whether this is a line-item or order-level apportioned
service charge. | String getScope() | -| `AppliedServiceCharges` | [`List`](../../doc/models/order-line-item-applied-service-charge.md) | Optional | The list of references to service charges applied to the`OrderReturnServiceCharge`. Each
`OrderLineItemAppliedServiceCharge` has a `service_charge_id` that references the `uid` of a
top-level `OrderReturnServiceCharge`. On reads, the amount applied is populated. | List getAppliedServiceCharges() | -| `TotalServiceChargeMoney` | [`Money`](../../doc/models/money.md) | Optional | Represents an amount of money. `Money` fields can be signed or unsigned.
Fields that do not explicitly define whether they are signed or unsigned are
considered unsigned and can only hold positive amounts. For signed fields, the
sign of the value indicates the purpose of the money transfer. See
[Working with Monetary Amounts](https://developer.squareup.com/docs/build-basics/working-with-monetary-amounts)
for more information. | Money getTotalServiceChargeMoney() | ## Example (as JSON) diff --git a/doc/models/order-service-charge.md b/doc/models/order-service-charge.md index b90f624d..e7e7ae03 100644 --- a/doc/models/order-service-charge.md +++ b/doc/models/order-service-charge.md @@ -27,8 +27,6 @@ Represents a service charge applied to an order. | `Type` | [`String`](../../doc/models/order-service-charge-type.md) | Optional | - | String getType() | | `TreatmentType` | [`String`](../../doc/models/order-service-charge-treatment-type.md) | Optional | Indicates whether the service charge will be treated as a value-holding line item or
apportioned toward a line item. | String getTreatmentType() | | `Scope` | [`String`](../../doc/models/order-service-charge-scope.md) | Optional | Indicates whether this is a line-item or order-level apportioned
service charge. | String getScope() | -| `AppliedServiceCharges` | [`List`](../../doc/models/order-line-item-applied-service-charge.md) | Optional | The list of references to service charges applied to this service charge. Each
`OrderLineItemAppliedServiceCharge` has a `service_charge_id` that references the `uid` of a
top-level `OrderServiceCharge`. On reads, the amount applied is populated.

To change the amount of a service charge, modify the referenced top-level service charge. | List getAppliedServiceCharges() | -| `TotalServiceChargeMoney` | [`Money`](../../doc/models/money.md) | Optional | Represents an amount of money. `Money` fields can be signed or unsigned.
Fields that do not explicitly define whether they are signed or unsigned are
considered unsigned and can only hold positive amounts. For signed fields, the
sign of the value indicates the purpose of the money transfer. See
[Working with Monetary Amounts](https://developer.squareup.com/docs/build-basics/working-with-monetary-amounts)
for more information. | Money getTotalServiceChargeMoney() | ## Example (as JSON) diff --git a/pom.xml b/pom.xml index b85ebe51..e0af0800 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.squareup square - 37.0.0.20240118 + 37.0.1.20240118 jar Square Java client library for the Square API diff --git a/src/main/java/com/squareup/square/SquareClient.java b/src/main/java/com/squareup/square/SquareClient.java index de4c878e..951e6d2b 100644 --- a/src/main/java/com/squareup/square/SquareClient.java +++ b/src/main/java/com/squareup/square/SquareClient.java @@ -151,7 +151,7 @@ public final class SquareClient implements SquareClientInterface { private static final CompatibilityFactory compatibilityFactory = new CompatibilityFactoryImpl(); - private static String userAgent = "Square-Java-SDK/37.0.0.20240118 ({api-version}) {engine}/{engine-version} ({os-info}) {detail}"; + private static String userAgent = "Square-Java-SDK/37.0.1.20240118 ({api-version}) {engine}/{engine-version} ({os-info}) {detail}"; /** * Current API environment. @@ -697,7 +697,7 @@ public String getAccessToken() { * @return sdkVersion */ public String getSdkVersion() { - return "37.0.0.20240118"; + return "37.0.1.20240118"; } /** diff --git a/src/main/java/com/squareup/square/models/Fulfillment.java b/src/main/java/com/squareup/square/models/Fulfillment.java index f0c532a2..56188b62 100644 --- a/src/main/java/com/squareup/square/models/Fulfillment.java +++ b/src/main/java/com/squareup/square/models/Fulfillment.java @@ -25,7 +25,6 @@ public class Fulfillment { private final FulfillmentPickupDetails pickupDetails; private final FulfillmentShipmentDetails shipmentDetails; private final FulfillmentDeliveryDetails deliveryDetails; - private final Integer version; /** * Initialization constructor. @@ -38,7 +37,6 @@ public class Fulfillment { * @param pickupDetails FulfillmentPickupDetails value for pickupDetails. * @param shipmentDetails FulfillmentShipmentDetails value for shipmentDetails. * @param deliveryDetails FulfillmentDeliveryDetails value for deliveryDetails. - * @param version Integer value for version. */ @JsonCreator public Fulfillment( @@ -50,8 +48,7 @@ public Fulfillment( @JsonProperty("metadata") Map metadata, @JsonProperty("pickup_details") FulfillmentPickupDetails pickupDetails, @JsonProperty("shipment_details") FulfillmentShipmentDetails shipmentDetails, - @JsonProperty("delivery_details") FulfillmentDeliveryDetails deliveryDetails, - @JsonProperty("version") Integer version) { + @JsonProperty("delivery_details") FulfillmentDeliveryDetails deliveryDetails) { this.uid = OptionalNullable.of(uid); this.type = type; this.state = state; @@ -61,7 +58,6 @@ public Fulfillment( this.pickupDetails = pickupDetails; this.shipmentDetails = shipmentDetails; this.deliveryDetails = deliveryDetails; - this.version = version; } /** @@ -75,14 +71,13 @@ public Fulfillment( * @param pickupDetails FulfillmentPickupDetails value for pickupDetails. * @param shipmentDetails FulfillmentShipmentDetails value for shipmentDetails. * @param deliveryDetails FulfillmentDeliveryDetails value for deliveryDetails. - * @param version Integer value for version. */ protected Fulfillment(OptionalNullable uid, String type, String state, String lineItemApplication, List entries, OptionalNullable> metadata, FulfillmentPickupDetails pickupDetails, - FulfillmentShipmentDetails shipmentDetails, FulfillmentDeliveryDetails deliveryDetails, - Integer version) { + FulfillmentShipmentDetails shipmentDetails, + FulfillmentDeliveryDetails deliveryDetails) { this.uid = uid; this.type = type; this.state = state; @@ -92,7 +87,6 @@ protected Fulfillment(OptionalNullable uid, String type, String state, this.pickupDetails = pickupDetails; this.shipmentDetails = shipmentDetails; this.deliveryDetails = deliveryDetails; - this.version = version; } /** @@ -243,23 +237,10 @@ public FulfillmentDeliveryDetails getDeliveryDetails() { return deliveryDetails; } - /** - * Getter for Version. - * The version number attributed to the fulfillment and incremented every time there is a - * fulfillment-related update. The fulfillment version is an internal field only for use between - * Orders and the Fulfillment service. - * @return Returns the Integer - */ - @JsonGetter("version") - @JsonInclude(JsonInclude.Include.NON_NULL) - public Integer getVersion() { - return version; - } - @Override public int hashCode() { return Objects.hash(uid, type, state, lineItemApplication, entries, metadata, pickupDetails, - shipmentDetails, deliveryDetails, version); + shipmentDetails, deliveryDetails); } @Override @@ -279,8 +260,7 @@ public boolean equals(Object obj) { && Objects.equals(metadata, other.metadata) && Objects.equals(pickupDetails, other.pickupDetails) && Objects.equals(shipmentDetails, other.shipmentDetails) - && Objects.equals(deliveryDetails, other.deliveryDetails) - && Objects.equals(version, other.version); + && Objects.equals(deliveryDetails, other.deliveryDetails); } /** @@ -293,7 +273,7 @@ public String toString() { + ", lineItemApplication=" + lineItemApplication + ", entries=" + entries + ", metadata=" + metadata + ", pickupDetails=" + pickupDetails + ", shipmentDetails=" + shipmentDetails + ", deliveryDetails=" + deliveryDetails - + ", version=" + version + "]"; + + "]"; } /** @@ -309,8 +289,7 @@ public Builder toBuilder() { .entries(getEntries()) .pickupDetails(getPickupDetails()) .shipmentDetails(getShipmentDetails()) - .deliveryDetails(getDeliveryDetails()) - .version(getVersion()); + .deliveryDetails(getDeliveryDetails()); builder.uid = internalGetUid(); builder.metadata = internalGetMetadata(); return builder; @@ -329,7 +308,6 @@ public static class Builder { private FulfillmentPickupDetails pickupDetails; private FulfillmentShipmentDetails shipmentDetails; private FulfillmentDeliveryDetails deliveryDetails; - private Integer version; @@ -441,23 +419,13 @@ public Builder deliveryDetails(FulfillmentDeliveryDetails deliveryDetails) { return this; } - /** - * Setter for version. - * @param version Integer value for version. - * @return Builder - */ - public Builder version(Integer version) { - this.version = version; - return this; - } - /** * Builds a new {@link Fulfillment} object using the set fields. * @return {@link Fulfillment} */ public Fulfillment build() { return new Fulfillment(uid, type, state, lineItemApplication, entries, metadata, - pickupDetails, shipmentDetails, deliveryDetails, version); + pickupDetails, shipmentDetails, deliveryDetails); } } } diff --git a/src/main/java/com/squareup/square/models/OrderReturnServiceCharge.java b/src/main/java/com/squareup/square/models/OrderReturnServiceCharge.java index d0467ab7..268ed8dd 100644 --- a/src/main/java/com/squareup/square/models/OrderReturnServiceCharge.java +++ b/src/main/java/com/squareup/square/models/OrderReturnServiceCharge.java @@ -30,8 +30,6 @@ public class OrderReturnServiceCharge { private final OptionalNullable> appliedTaxes; private final String treatmentType; private final String scope; - private final OptionalNullable> appliedServiceCharges; - private final Money totalServiceChargeMoney; /** * Initialization constructor. @@ -50,9 +48,6 @@ public class OrderReturnServiceCharge { * @param appliedTaxes List of OrderLineItemAppliedTax value for appliedTaxes. * @param treatmentType String value for treatmentType. * @param scope String value for scope. - * @param appliedServiceCharges List of OrderLineItemAppliedServiceCharge value for - * appliedServiceCharges. - * @param totalServiceChargeMoney Money value for totalServiceChargeMoney. */ @JsonCreator public OrderReturnServiceCharge( @@ -70,9 +65,7 @@ public OrderReturnServiceCharge( @JsonProperty("taxable") Boolean taxable, @JsonProperty("applied_taxes") List appliedTaxes, @JsonProperty("treatment_type") String treatmentType, - @JsonProperty("scope") String scope, - @JsonProperty("applied_service_charges") List appliedServiceCharges, - @JsonProperty("total_service_charge_money") Money totalServiceChargeMoney) { + @JsonProperty("scope") String scope) { this.uid = OptionalNullable.of(uid); this.sourceServiceChargeUid = OptionalNullable.of(sourceServiceChargeUid); this.name = OptionalNullable.of(name); @@ -88,8 +81,6 @@ public OrderReturnServiceCharge( this.appliedTaxes = OptionalNullable.of(appliedTaxes); this.treatmentType = treatmentType; this.scope = scope; - this.appliedServiceCharges = OptionalNullable.of(appliedServiceCharges); - this.totalServiceChargeMoney = totalServiceChargeMoney; } /** @@ -109,9 +100,6 @@ public OrderReturnServiceCharge( * @param appliedTaxes List of OrderLineItemAppliedTax value for appliedTaxes. * @param treatmentType String value for treatmentType. * @param scope String value for scope. - * @param appliedServiceCharges List of OrderLineItemAppliedServiceCharge value for - * appliedServiceCharges. - * @param totalServiceChargeMoney Money value for totalServiceChargeMoney. */ protected OrderReturnServiceCharge(OptionalNullable uid, @@ -121,9 +109,7 @@ protected OrderReturnServiceCharge(OptionalNullable uid, Money totalMoney, Money totalTaxMoney, String calculationPhase, OptionalNullable taxable, OptionalNullable> appliedTaxes, String treatmentType, - String scope, - OptionalNullable> appliedServiceCharges, - Money totalServiceChargeMoney) { + String scope) { this.uid = uid; this.sourceServiceChargeUid = sourceServiceChargeUid; this.name = name; @@ -139,8 +125,6 @@ protected OrderReturnServiceCharge(OptionalNullable uid, this.appliedTaxes = appliedTaxes; this.treatmentType = treatmentType; this.scope = scope; - this.appliedServiceCharges = appliedServiceCharges; - this.totalServiceChargeMoney = totalServiceChargeMoney; } /** @@ -433,54 +417,11 @@ public String getScope() { return scope; } - /** - * Internal Getter for AppliedServiceCharges. - * The list of references to service charges applied to the`OrderReturnServiceCharge`. Each - * `OrderLineItemAppliedServiceCharge` has a `service_charge_id` that references the `uid` of a - * top-level `OrderReturnServiceCharge`. On reads, the amount applied is populated. - * @return Returns the Internal List of OrderLineItemAppliedServiceCharge - */ - @JsonGetter("applied_service_charges") - @JsonInclude(JsonInclude.Include.NON_NULL) - @JsonSerialize(using = OptionalNullable.Serializer.class) - protected OptionalNullable> internalGetAppliedServiceCharges() { - return this.appliedServiceCharges; - } - - /** - * Getter for AppliedServiceCharges. - * The list of references to service charges applied to the`OrderReturnServiceCharge`. Each - * `OrderLineItemAppliedServiceCharge` has a `service_charge_id` that references the `uid` of a - * top-level `OrderReturnServiceCharge`. On reads, the amount applied is populated. - * @return Returns the List of OrderLineItemAppliedServiceCharge - */ - @JsonIgnore - public List getAppliedServiceCharges() { - return OptionalNullable.getFrom(appliedServiceCharges); - } - - /** - * Getter for TotalServiceChargeMoney. - * Represents an amount of money. `Money` fields can be signed or unsigned. Fields that do not - * explicitly define whether they are signed or unsigned are considered unsigned and can only - * hold positive amounts. For signed fields, the sign of the value indicates the purpose of the - * money transfer. See [Working with Monetary - * Amounts](https://developer.squareup.com/docs/build-basics/working-with-monetary-amounts) for - * more information. - * @return Returns the Money - */ - @JsonGetter("total_service_charge_money") - @JsonInclude(JsonInclude.Include.NON_NULL) - public Money getTotalServiceChargeMoney() { - return totalServiceChargeMoney; - } - @Override public int hashCode() { return Objects.hash(uid, sourceServiceChargeUid, name, catalogObjectId, catalogVersion, percentage, amountMoney, appliedMoney, totalMoney, totalTaxMoney, calculationPhase, - taxable, appliedTaxes, treatmentType, scope, appliedServiceCharges, - totalServiceChargeMoney); + taxable, appliedTaxes, treatmentType, scope); } @Override @@ -506,9 +447,7 @@ public boolean equals(Object obj) { && Objects.equals(taxable, other.taxable) && Objects.equals(appliedTaxes, other.appliedTaxes) && Objects.equals(treatmentType, other.treatmentType) - && Objects.equals(scope, other.scope) - && Objects.equals(appliedServiceCharges, other.appliedServiceCharges) - && Objects.equals(totalServiceChargeMoney, other.totalServiceChargeMoney); + && Objects.equals(scope, other.scope); } /** @@ -524,8 +463,7 @@ public String toString() { + ", totalMoney=" + totalMoney + ", totalTaxMoney=" + totalTaxMoney + ", calculationPhase=" + calculationPhase + ", taxable=" + taxable + ", appliedTaxes=" + appliedTaxes + ", treatmentType=" + treatmentType + ", scope=" - + scope + ", appliedServiceCharges=" + appliedServiceCharges - + ", totalServiceChargeMoney=" + totalServiceChargeMoney + "]"; + + scope + "]"; } /** @@ -541,8 +479,7 @@ public Builder toBuilder() { .totalTaxMoney(getTotalTaxMoney()) .calculationPhase(getCalculationPhase()) .treatmentType(getTreatmentType()) - .scope(getScope()) - .totalServiceChargeMoney(getTotalServiceChargeMoney()); + .scope(getScope()); builder.uid = internalGetUid(); builder.sourceServiceChargeUid = internalGetSourceServiceChargeUid(); builder.name = internalGetName(); @@ -551,7 +488,6 @@ public Builder toBuilder() { builder.percentage = internalGetPercentage(); builder.taxable = internalGetTaxable(); builder.appliedTaxes = internalGetAppliedTaxes(); - builder.appliedServiceCharges = internalGetAppliedServiceCharges(); return builder; } @@ -574,8 +510,6 @@ public static class Builder { private OptionalNullable> appliedTaxes; private String treatmentType; private String scope; - private OptionalNullable> appliedServiceCharges; - private Money totalServiceChargeMoney; @@ -801,37 +735,6 @@ public Builder scope(String scope) { return this; } - /** - * Setter for appliedServiceCharges. - * @param appliedServiceCharges List of OrderLineItemAppliedServiceCharge value for - * appliedServiceCharges. - * @return Builder - */ - public Builder appliedServiceCharges( - List appliedServiceCharges) { - this.appliedServiceCharges = OptionalNullable.of(appliedServiceCharges); - return this; - } - - /** - * UnSetter for appliedServiceCharges. - * @return Builder - */ - public Builder unsetAppliedServiceCharges() { - appliedServiceCharges = null; - return this; - } - - /** - * Setter for totalServiceChargeMoney. - * @param totalServiceChargeMoney Money value for totalServiceChargeMoney. - * @return Builder - */ - public Builder totalServiceChargeMoney(Money totalServiceChargeMoney) { - this.totalServiceChargeMoney = totalServiceChargeMoney; - return this; - } - /** * Builds a new {@link OrderReturnServiceCharge} object using the set fields. * @return {@link OrderReturnServiceCharge} @@ -839,8 +742,7 @@ public Builder totalServiceChargeMoney(Money totalServiceChargeMoney) { public OrderReturnServiceCharge build() { return new OrderReturnServiceCharge(uid, sourceServiceChargeUid, name, catalogObjectId, catalogVersion, percentage, amountMoney, appliedMoney, totalMoney, - totalTaxMoney, calculationPhase, taxable, appliedTaxes, treatmentType, scope, - appliedServiceCharges, totalServiceChargeMoney); + totalTaxMoney, calculationPhase, taxable, appliedTaxes, treatmentType, scope); } } } diff --git a/src/main/java/com/squareup/square/models/OrderServiceCharge.java b/src/main/java/com/squareup/square/models/OrderServiceCharge.java index b330f4b0..71bb90d2 100644 --- a/src/main/java/com/squareup/square/models/OrderServiceCharge.java +++ b/src/main/java/com/squareup/square/models/OrderServiceCharge.java @@ -32,8 +32,6 @@ public class OrderServiceCharge { private final String type; private final String treatmentType; private final String scope; - private final OptionalNullable> appliedServiceCharges; - private final Money totalServiceChargeMoney; /** * Initialization constructor. @@ -53,9 +51,6 @@ public class OrderServiceCharge { * @param type String value for type. * @param treatmentType String value for treatmentType. * @param scope String value for scope. - * @param appliedServiceCharges List of OrderLineItemAppliedServiceCharge value for - * appliedServiceCharges. - * @param totalServiceChargeMoney Money value for totalServiceChargeMoney. */ @JsonCreator public OrderServiceCharge( @@ -74,9 +69,7 @@ public OrderServiceCharge( @JsonProperty("metadata") Map metadata, @JsonProperty("type") String type, @JsonProperty("treatment_type") String treatmentType, - @JsonProperty("scope") String scope, - @JsonProperty("applied_service_charges") List appliedServiceCharges, - @JsonProperty("total_service_charge_money") Money totalServiceChargeMoney) { + @JsonProperty("scope") String scope) { this.uid = OptionalNullable.of(uid); this.name = OptionalNullable.of(name); this.catalogObjectId = OptionalNullable.of(catalogObjectId); @@ -93,8 +86,6 @@ public OrderServiceCharge( this.type = type; this.treatmentType = treatmentType; this.scope = scope; - this.appliedServiceCharges = OptionalNullable.of(appliedServiceCharges); - this.totalServiceChargeMoney = totalServiceChargeMoney; } /** @@ -115,9 +106,6 @@ public OrderServiceCharge( * @param type String value for type. * @param treatmentType String value for treatmentType. * @param scope String value for scope. - * @param appliedServiceCharges List of OrderLineItemAppliedServiceCharge value for - * appliedServiceCharges. - * @param totalServiceChargeMoney Money value for totalServiceChargeMoney. */ protected OrderServiceCharge(OptionalNullable uid, OptionalNullable name, @@ -127,9 +115,7 @@ protected OrderServiceCharge(OptionalNullable uid, OptionalNullable taxable, OptionalNullable> appliedTaxes, OptionalNullable> metadata, String type, String treatmentType, - String scope, - OptionalNullable> appliedServiceCharges, - Money totalServiceChargeMoney) { + String scope) { this.uid = uid; this.name = name; this.catalogObjectId = catalogObjectId; @@ -146,8 +132,6 @@ protected OrderServiceCharge(OptionalNullable uid, OptionalNullable> internalGetAppliedServiceCharges() { - return this.appliedServiceCharges; - } - - /** - * Getter for AppliedServiceCharges. - * The list of references to service charges applied to this service charge. Each - * `OrderLineItemAppliedServiceCharge` has a `service_charge_id` that references the `uid` of a - * top-level `OrderServiceCharge`. On reads, the amount applied is populated. To change the - * amount of a service charge, modify the referenced top-level service charge. - * @return Returns the List of OrderLineItemAppliedServiceCharge - */ - @JsonIgnore - public List getAppliedServiceCharges() { - return OptionalNullable.getFrom(appliedServiceCharges); - } - - /** - * Getter for TotalServiceChargeMoney. - * Represents an amount of money. `Money` fields can be signed or unsigned. Fields that do not - * explicitly define whether they are signed or unsigned are considered unsigned and can only - * hold positive amounts. For signed fields, the sign of the value indicates the purpose of the - * money transfer. See [Working with Monetary - * Amounts](https://developer.squareup.com/docs/build-basics/working-with-monetary-amounts) for - * more information. - * @return Returns the Money - */ - @JsonGetter("total_service_charge_money") - @JsonInclude(JsonInclude.Include.NON_NULL) - public Money getTotalServiceChargeMoney() { - return totalServiceChargeMoney; - } - @Override public int hashCode() { return Objects.hash(uid, name, catalogObjectId, catalogVersion, percentage, amountMoney, appliedMoney, totalMoney, totalTaxMoney, calculationPhase, taxable, appliedTaxes, - metadata, type, treatmentType, scope, appliedServiceCharges, - totalServiceChargeMoney); + metadata, type, treatmentType, scope); } @Override @@ -556,9 +495,7 @@ public boolean equals(Object obj) { && Objects.equals(metadata, other.metadata) && Objects.equals(type, other.type) && Objects.equals(treatmentType, other.treatmentType) - && Objects.equals(scope, other.scope) - && Objects.equals(appliedServiceCharges, other.appliedServiceCharges) - && Objects.equals(totalServiceChargeMoney, other.totalServiceChargeMoney); + && Objects.equals(scope, other.scope); } /** @@ -573,9 +510,7 @@ public String toString() { + ", totalMoney=" + totalMoney + ", totalTaxMoney=" + totalTaxMoney + ", calculationPhase=" + calculationPhase + ", taxable=" + taxable + ", appliedTaxes=" + appliedTaxes + ", metadata=" + metadata + ", type=" + type - + ", treatmentType=" + treatmentType + ", scope=" + scope - + ", appliedServiceCharges=" + appliedServiceCharges + ", totalServiceChargeMoney=" - + totalServiceChargeMoney + "]"; + + ", treatmentType=" + treatmentType + ", scope=" + scope + "]"; } /** @@ -592,8 +527,7 @@ public Builder toBuilder() { .calculationPhase(getCalculationPhase()) .type(getType()) .treatmentType(getTreatmentType()) - .scope(getScope()) - .totalServiceChargeMoney(getTotalServiceChargeMoney()); + .scope(getScope()); builder.uid = internalGetUid(); builder.name = internalGetName(); builder.catalogObjectId = internalGetCatalogObjectId(); @@ -602,7 +536,6 @@ public Builder toBuilder() { builder.taxable = internalGetTaxable(); builder.appliedTaxes = internalGetAppliedTaxes(); builder.metadata = internalGetMetadata(); - builder.appliedServiceCharges = internalGetAppliedServiceCharges(); return builder; } @@ -626,8 +559,6 @@ public static class Builder { private String type; private String treatmentType; private String scope; - private OptionalNullable> appliedServiceCharges; - private Money totalServiceChargeMoney; @@ -863,37 +794,6 @@ public Builder scope(String scope) { return this; } - /** - * Setter for appliedServiceCharges. - * @param appliedServiceCharges List of OrderLineItemAppliedServiceCharge value for - * appliedServiceCharges. - * @return Builder - */ - public Builder appliedServiceCharges( - List appliedServiceCharges) { - this.appliedServiceCharges = OptionalNullable.of(appliedServiceCharges); - return this; - } - - /** - * UnSetter for appliedServiceCharges. - * @return Builder - */ - public Builder unsetAppliedServiceCharges() { - appliedServiceCharges = null; - return this; - } - - /** - * Setter for totalServiceChargeMoney. - * @param totalServiceChargeMoney Money value for totalServiceChargeMoney. - * @return Builder - */ - public Builder totalServiceChargeMoney(Money totalServiceChargeMoney) { - this.totalServiceChargeMoney = totalServiceChargeMoney; - return this; - } - /** * Builds a new {@link OrderServiceCharge} object using the set fields. * @return {@link OrderServiceCharge} @@ -901,8 +801,7 @@ public Builder totalServiceChargeMoney(Money totalServiceChargeMoney) { public OrderServiceCharge build() { return new OrderServiceCharge(uid, name, catalogObjectId, catalogVersion, percentage, amountMoney, appliedMoney, totalMoney, totalTaxMoney, calculationPhase, taxable, - appliedTaxes, metadata, type, treatmentType, scope, appliedServiceCharges, - totalServiceChargeMoney); + appliedTaxes, metadata, type, treatmentType, scope); } } }