Skip to content

Commit 597c34f

Browse files
committed
Merge branch 'release/1.26.11.46'
2 parents 9631a11 + 79edd7b commit 597c34f

File tree

3 files changed

+303
-18
lines changed

3 files changed

+303
-18
lines changed
Lines changed: 276 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,276 @@
1+
package com.bunq.sdk.model.generated.endpoint;
2+
3+
import com.bunq.sdk.model.core.BunqModel;
4+
import com.bunq.sdk.model.core.MonetaryAccountReference;
5+
import com.bunq.sdk.model.generated.object.Amount;
6+
import com.bunq.sdk.model.generated.object.LabelMonetaryAccount;
7+
import com.bunq.sdk.model.generated.object.LabelUser;
8+
import com.google.gson.annotations.Expose;
9+
import com.google.gson.annotations.SerializedName;
10+
import com.google.gson.stream.JsonReader;
11+
import java.math.BigDecimal;
12+
import java.util.ArrayList;
13+
import java.util.HashMap;
14+
import java.util.List;
15+
import java.util.Map;
16+
17+
/**
18+
* Endpoint for reading Ginmon transactions.
19+
*/
20+
public class GinmonTransaction extends BunqModel {
21+
22+
/**
23+
* The status of the transaction.
24+
*/
25+
@Expose
26+
@SerializedName("status")
27+
private String status;
28+
29+
/**
30+
* The status of the transaction.
31+
*/
32+
@Expose
33+
@SerializedName("status_description")
34+
private String statusDescription;
35+
36+
/**
37+
* The translated status of the transaction.
38+
*/
39+
@Expose
40+
@SerializedName("status_description_translated")
41+
private String statusDescriptionTranslated;
42+
43+
/**
44+
* The final amount the user will pay or receive.
45+
*/
46+
@Expose
47+
@SerializedName("amount_billing")
48+
private Amount amountBilling;
49+
50+
/**
51+
* The estimated amount the user will pay or receive.
52+
*/
53+
@Expose
54+
@SerializedName("amount_billing_original")
55+
private Amount amountBillingOriginal;
56+
57+
/**
58+
* The ISIN of the security.
59+
*/
60+
@Expose
61+
@SerializedName("isin")
62+
private String isin;
63+
64+
/**
65+
* External identifier of this order at Ginmon.
66+
*/
67+
@Expose
68+
@SerializedName("external_identifier")
69+
private String externalIdentifier;
70+
71+
/**
72+
* The label of the user.
73+
*/
74+
@Expose
75+
@SerializedName("label_user")
76+
private LabelUser labelUser;
77+
78+
/**
79+
* The label of the monetary account.
80+
*/
81+
@Expose
82+
@SerializedName("label_monetary_account")
83+
private LabelMonetaryAccount labelMonetaryAccount;
84+
85+
/**
86+
* The label of the counter monetary account.
87+
*/
88+
@Expose
89+
@SerializedName("counter_label_monetary_account")
90+
private LabelMonetaryAccount counterLabelMonetaryAccount;
91+
92+
/**
93+
* The id of the event of transaction.
94+
*/
95+
@Expose
96+
@SerializedName("event_id")
97+
private Integer eventId;
98+
99+
/**
100+
* The status of the transaction.
101+
*/
102+
public String getStatus() {
103+
return this.status;
104+
}
105+
106+
public void setStatus(String status) {
107+
this.status = status;
108+
}
109+
110+
/**
111+
* The status of the transaction.
112+
*/
113+
public String getStatusDescription() {
114+
return this.statusDescription;
115+
}
116+
117+
public void setStatusDescription(String statusDescription) {
118+
this.statusDescription = statusDescription;
119+
}
120+
121+
/**
122+
* The translated status of the transaction.
123+
*/
124+
public String getStatusDescriptionTranslated() {
125+
return this.statusDescriptionTranslated;
126+
}
127+
128+
public void setStatusDescriptionTranslated(String statusDescriptionTranslated) {
129+
this.statusDescriptionTranslated = statusDescriptionTranslated;
130+
}
131+
132+
/**
133+
* The final amount the user will pay or receive.
134+
*/
135+
public Amount getAmountBilling() {
136+
return this.amountBilling;
137+
}
138+
139+
public void setAmountBilling(Amount amountBilling) {
140+
this.amountBilling = amountBilling;
141+
}
142+
143+
/**
144+
* The estimated amount the user will pay or receive.
145+
*/
146+
public Amount getAmountBillingOriginal() {
147+
return this.amountBillingOriginal;
148+
}
149+
150+
public void setAmountBillingOriginal(Amount amountBillingOriginal) {
151+
this.amountBillingOriginal = amountBillingOriginal;
152+
}
153+
154+
/**
155+
* The ISIN of the security.
156+
*/
157+
public String getIsin() {
158+
return this.isin;
159+
}
160+
161+
public void setIsin(String isin) {
162+
this.isin = isin;
163+
}
164+
165+
/**
166+
* External identifier of this order at Ginmon.
167+
*/
168+
public String getExternalIdentifier() {
169+
return this.externalIdentifier;
170+
}
171+
172+
public void setExternalIdentifier(String externalIdentifier) {
173+
this.externalIdentifier = externalIdentifier;
174+
}
175+
176+
/**
177+
* The label of the user.
178+
*/
179+
public LabelUser getLabelUser() {
180+
return this.labelUser;
181+
}
182+
183+
public void setLabelUser(LabelUser labelUser) {
184+
this.labelUser = labelUser;
185+
}
186+
187+
/**
188+
* The label of the monetary account.
189+
*/
190+
public LabelMonetaryAccount getLabelMonetaryAccount() {
191+
return this.labelMonetaryAccount;
192+
}
193+
194+
public void setLabelMonetaryAccount(LabelMonetaryAccount labelMonetaryAccount) {
195+
this.labelMonetaryAccount = labelMonetaryAccount;
196+
}
197+
198+
/**
199+
* The label of the counter monetary account.
200+
*/
201+
public LabelMonetaryAccount getCounterLabelMonetaryAccount() {
202+
return this.counterLabelMonetaryAccount;
203+
}
204+
205+
public void setCounterLabelMonetaryAccount(LabelMonetaryAccount counterLabelMonetaryAccount) {
206+
this.counterLabelMonetaryAccount = counterLabelMonetaryAccount;
207+
}
208+
209+
/**
210+
* The id of the event of transaction.
211+
*/
212+
public Integer getEventId() {
213+
return this.eventId;
214+
}
215+
216+
public void setEventId(Integer eventId) {
217+
this.eventId = eventId;
218+
}
219+
220+
/**
221+
*/
222+
public boolean isAllFieldNull() {
223+
if (this.status != null) {
224+
return false;
225+
}
226+
227+
if (this.statusDescription != null) {
228+
return false;
229+
}
230+
231+
if (this.statusDescriptionTranslated != null) {
232+
return false;
233+
}
234+
235+
if (this.amountBilling != null) {
236+
return false;
237+
}
238+
239+
if (this.amountBillingOriginal != null) {
240+
return false;
241+
}
242+
243+
if (this.isin != null) {
244+
return false;
245+
}
246+
247+
if (this.externalIdentifier != null) {
248+
return false;
249+
}
250+
251+
if (this.labelUser != null) {
252+
return false;
253+
}
254+
255+
if (this.labelMonetaryAccount != null) {
256+
return false;
257+
}
258+
259+
if (this.counterLabelMonetaryAccount != null) {
260+
return false;
261+
}
262+
263+
if (this.eventId != null) {
264+
return false;
265+
}
266+
267+
return true;
268+
}
269+
270+
/**
271+
*/
272+
public static GinmonTransaction fromJsonReader(JsonReader reader) {
273+
return fromJsonReader(GinmonTransaction.class, reader);
274+
}
275+
276+
}

src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentAutoAllocateDefinition.java

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public class PaymentAutoAllocateDefinition extends BunqModel {
3636
public static final String FIELD_DESCRIPTION = "description";
3737
public static final String FIELD_AMOUNT = "amount";
3838
public static final String FIELD_FRACTION = "fraction";
39-
public static final String FIELD_GINMON_COST_DISCLOSURE_ID = "ginmon_cost_disclosure_id";
4039

4140
/**
4241
* Object type.
@@ -127,44 +126,32 @@ public class PaymentAutoAllocateDefinition extends BunqModel {
127126
@SerializedName("fraction_field_for_request")
128127
private BigDecimal fractionFieldForRequest;
129128

130-
/**
131-
* The id of the ginmon cost disclosure, if this definition is a scheduled order.
132-
*/
133-
@Expose
134-
@SerializedName("ginmon_cost_disclosure_id_field_for_request")
135-
private String ginmonCostDisclosureIdFieldForRequest;
136-
137129
public PaymentAutoAllocateDefinition() {
138-
this(null, null, null, null, null, null);
130+
this(null, null, null, null, null);
139131
}
140132

141133
public PaymentAutoAllocateDefinition(String type) {
142-
this(type, null, null, null, null, null);
134+
this(type, null, null, null, null);
143135
}
144136

145137
public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias) {
146-
this(type, counterpartyAlias, null, null, null, null);
138+
this(type, counterpartyAlias, null, null, null);
147139
}
148140

149141
public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description) {
150-
this(type, counterpartyAlias, description, null, null, null);
142+
this(type, counterpartyAlias, description, null, null);
151143
}
152144

153145
public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description, Amount amount) {
154-
this(type, counterpartyAlias, description, amount, null, null);
146+
this(type, counterpartyAlias, description, amount, null);
155147
}
156148

157149
public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description, Amount amount, BigDecimal fraction) {
158-
this(type, counterpartyAlias, description, amount, fraction, null);
159-
}
160-
161-
public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description, Amount amount, BigDecimal fraction, String ginmonCostDisclosureId) {
162150
this.typeFieldForRequest = type;
163151
this.counterpartyAliasFieldForRequest = counterpartyAlias;
164152
this.descriptionFieldForRequest = description;
165153
this.amountFieldForRequest = amount;
166154
this.fractionFieldForRequest = fraction;
167-
this.ginmonCostDisclosureIdFieldForRequest = ginmonCostDisclosureId;
168155
} /**
169156
*/
170157
public static BunqResponse<List<PaymentAutoAllocateDefinition>> list(Integer paymentAutoAllocateId, Integer monetaryAccountId, Map<String, String> params, Map<String, String> customHeaders) {

src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentAutoAllocateInstance.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@ public class PaymentAutoAllocateInstance extends BunqModel {
8989
@SerializedName("payment_id")
9090
private Integer paymentId;
9191

92+
/**
93+
* All Ginmon transaction orders executed with this instance.
94+
*/
95+
@Expose
96+
@SerializedName("all_ginmon_transaction_order")
97+
private List<GinmonTransaction> allGinmonTransactionOrder;
98+
9299
/**
93100
*/
94101
public static BunqResponse<List<PaymentAutoAllocateInstance>> list(Integer paymentAutoAllocateId, Integer monetaryAccountId, Map<String, String> params, Map<String, String> customHeaders) {
@@ -231,6 +238,17 @@ public void setPaymentId(Integer paymentId) {
231238
this.paymentId = paymentId;
232239
}
233240

241+
/**
242+
* All Ginmon transaction orders executed with this instance.
243+
*/
244+
public List<GinmonTransaction> getAllGinmonTransactionOrder() {
245+
return this.allGinmonTransactionOrder;
246+
}
247+
248+
public void setAllGinmonTransactionOrder(List<GinmonTransaction> allGinmonTransactionOrder) {
249+
this.allGinmonTransactionOrder = allGinmonTransactionOrder;
250+
}
251+
234252
/**
235253
*/
236254
public boolean isAllFieldNull() {
@@ -266,6 +284,10 @@ public boolean isAllFieldNull() {
266284
return false;
267285
}
268286

287+
if (this.allGinmonTransactionOrder != null) {
288+
return false;
289+
}
290+
269291
return true;
270292
}
271293

0 commit comments

Comments
 (0)