Skip to content

Commit e1390b9

Browse files
authored
Merge pull request #127 from square/eden/update-optional-tender-id
Update `Refund.java` to reflect optional `tender_id`.
2 parents 99023f2 + b81075b commit e1390b9

File tree

1 file changed

+31
-11
lines changed

1 file changed

+31
-11
lines changed

src/main/java/com/squareup/square/models/Refund.java

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Refund {
1818
private final String id;
1919
private final String locationId;
2020
private final OptionalNullable<String> transactionId;
21-
private final String tenderId;
21+
private final OptionalNullable<String> tenderId;
2222
private final String createdAt;
2323
private final String reason;
2424
private final Money amountMoney;
@@ -54,7 +54,7 @@ public Refund(
5454
this.id = id;
5555
this.locationId = locationId;
5656
this.transactionId = OptionalNullable.of(transactionId);
57-
this.tenderId = tenderId;
57+
this.tenderId = OptionalNullable.of(tenderId);
5858
this.createdAt = createdAt;
5959
this.reason = reason;
6060
this.amountMoney = amountMoney;
@@ -77,7 +77,7 @@ public Refund(
7777
* @param additionalRecipients List of AdditionalRecipient value for additionalRecipients.
7878
*/
7979

80-
protected Refund(String id, String locationId, String tenderId, String reason,
80+
protected Refund(String id, String locationId, OptionalNullable<String> tenderId, String reason,
8181
Money amountMoney, String status, OptionalNullable<String> transactionId,
8282
String createdAt, Money processingFeeMoney,
8383
OptionalNullable<List<AdditionalRecipient>> additionalRecipients) {
@@ -135,14 +135,26 @@ public String getTransactionId() {
135135
return OptionalNullable.getFrom(transactionId);
136136
}
137137

138+
/**
139+
* Internal Getter for TenderId.
140+
* The ID of the refunded tender.
141+
* @return Returns the Internal String
142+
*/
143+
@JsonGetter("tender_id")
144+
@JsonInclude(JsonInclude.Include.NON_NULL)
145+
@JsonSerialize(using = OptionalNullable.Serializer.class)
146+
protected OptionalNullable<String> internalGetTenderId() {
147+
return this.tenderId;
148+
}
149+
138150
/**
139151
* Getter for TenderId.
140152
* The ID of the refunded tender.
141153
* @return Returns the String
142154
*/
143-
@JsonGetter("tender_id")
155+
@JsonIgnore
144156
public String getTenderId() {
145-
return tenderId;
157+
return OptionalNullable.getFrom(tenderId);
146158
}
147159

148160
/**
@@ -277,10 +289,11 @@ public String toString() {
277289
* @return a new {@link Refund.Builder} object
278290
*/
279291
public Builder toBuilder() {
280-
Builder builder = new Builder(id, locationId, tenderId, reason, amountMoney, status)
292+
Builder builder = new Builder(id, locationId, reason, amountMoney, status)
281293
.createdAt(getCreatedAt())
282294
.processingFeeMoney(getProcessingFeeMoney());
283295
builder.transactionId = internalGetTransactionId();
296+
builder.tenderId = internalGetTenderId();
284297
builder.additionalRecipients = internalGetAdditionalRecipients();
285298
return builder;
286299
}
@@ -291,7 +304,7 @@ public Builder toBuilder() {
291304
public static class Builder {
292305
private String id;
293306
private String locationId;
294-
private String tenderId;
307+
private OptionalNullable<String> tenderId;
295308
private String reason;
296309
private Money amountMoney;
297310
private String status;
@@ -304,16 +317,14 @@ public static class Builder {
304317
* Initialization constructor.
305318
* @param id String value for id.
306319
* @param locationId String value for locationId.
307-
* @param tenderId String value for tenderId.
308320
* @param reason String value for reason.
309321
* @param amountMoney Money value for amountMoney.
310322
* @param status String value for status.
311323
*/
312-
public Builder(String id, String locationId, String tenderId, String reason,
324+
public Builder(String id, String locationId, String reason,
313325
Money amountMoney, String status) {
314326
this.id = id;
315327
this.locationId = locationId;
316-
this.tenderId = tenderId;
317328
this.reason = reason;
318329
this.amountMoney = amountMoney;
319330
this.status = status;
@@ -345,7 +356,16 @@ public Builder locationId(String locationId) {
345356
* @return Builder
346357
*/
347358
public Builder tenderId(String tenderId) {
348-
this.tenderId = tenderId;
359+
this.tenderId = OptionalNullable.of(tenderId);
360+
return this;
361+
}
362+
363+
/**
364+
* UnSetter for tenderId.
365+
* @return Builder
366+
*/
367+
public Builder unsetTenderId() {
368+
tenderId = null;
349369
return this;
350370
}
351371

0 commit comments

Comments
 (0)