Skip to content

Commit 04405cf

Browse files
angelomelonasangelomelonas
committed
Merge branch 'release/1.14.18'
2 parents 7a6819c + 5e563cf commit 04405cf

File tree

5 files changed

+79
-110
lines changed

5 files changed

+79
-110
lines changed

‎.DS_Store

2 KB
Binary file not shown.

‎src/main/java/com/bunq/sdk/http/BunqHeader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public enum BunqHeader {
1818
LANGUAGE("X-Bunq-Language", "en_US"),
1919
REGION("X-Bunq-Region", "nl_NL"),
2020
SERVER_SIGNATURE("X-Bunq-Server-Signature"),
21-
USER_AGENT("User-Agent", "bunq-sdk-java/1.14.1");
21+
USER_AGENT("User-Agent", "bunq-sdk-java/1.14.18");
2222

2323
private static final String PREFIX = "X-Bunq-";
2424

‎src/main/java/com/bunq/sdk/model/generated/endpoint/Company.java

+39-20
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class Company extends BunqModel {
2929
public static final String FIELD_UBO = "ubo";
3030
public static final String FIELD_CHAMBER_OF_COMMERCE_NUMBER = "chamber_of_commerce_number";
3131
public static final String FIELD_LEGAL_FORM = "legal_form";
32+
public static final String FIELD_SUBSCRIPTION_TYPE = "subscription_type";
3233
public static final String FIELD_AVATAR_UUID = "avatar_uuid";
3334
/**
3435
* Endpoint constants.
@@ -99,6 +100,13 @@ public class Company extends BunqModel {
99100
@SerializedName("legal_form_field_for_request")
100101
private String legalFormFieldForRequest;
101102

103+
/**
104+
* The subscription type for the company.
105+
*/
106+
@Expose
107+
@SerializedName("subscription_type_field_for_request")
108+
private String subscriptionTypeFieldForRequest;
109+
102110
/**
103111
* The public UUID of the company's avatar.
104112
*/
@@ -107,45 +115,50 @@ public class Company extends BunqModel {
107115
private String avatarUuidFieldForRequest;
108116

109117
public Company() {
110-
this(null, null, null, null, null, null, null, null);
118+
this(null, null, null, null, null, null, null, null, null);
111119
}
112120

113121
public Company(String name) {
114-
this(name, null, null, null, null, null, null, null);
122+
this(name, null, null, null, null, null, null, null, null);
115123
}
116124

117125
public Company(String name, Address addressMain) {
118-
this(name, addressMain, null, null, null, null, null, null);
126+
this(name, addressMain, null, null, null, null, null, null, null);
119127
}
120128

121129
public Company(String name, Address addressMain, Address addressPostal) {
122-
this(name, addressMain, addressPostal, null, null, null, null, null);
130+
this(name, addressMain, addressPostal, null, null, null, null, null, null);
123131
}
124132

125133
public Company(String name, Address addressMain, Address addressPostal, String country) {
126-
this(name, addressMain, addressPostal, country, null, null, null, null);
134+
this(name, addressMain, addressPostal, country, null, null, null, null, null);
127135
}
128136

129137
public Company(String name, Address addressMain, Address addressPostal, String country, String legalForm) {
130-
this(name, addressMain, addressPostal, country, legalForm, null, null, null);
138+
this(name, addressMain, addressPostal, country, legalForm, null, null, null, null);
131139
}
132140

133141
public Company(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo) {
134-
this(name, addressMain, addressPostal, country, legalForm, ubo, null, null);
142+
this(name, addressMain, addressPostal, country, legalForm, ubo, null, null, null);
135143
}
136144

137145
public Company(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber) {
138-
this(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, null);
146+
this(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, null, null);
139147
}
140148

141-
public Company(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String avatarUuid) {
149+
public Company(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String subscriptionType) {
150+
this(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, subscriptionType, null);
151+
}
152+
153+
public Company(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String subscriptionType, String avatarUuid) {
142154
this.nameFieldForRequest = name;
143155
this.addressMainFieldForRequest = addressMain;
144156
this.addressPostalFieldForRequest = addressPostal;
145157
this.countryFieldForRequest = country;
146158
this.uboFieldForRequest = ubo;
147159
this.chamberOfCommerceNumberFieldForRequest = chamberOfCommerceNumber;
148160
this.legalFormFieldForRequest = legalForm;
161+
this.subscriptionTypeFieldForRequest = subscriptionType;
149162
this.avatarUuidFieldForRequest = avatarUuid;
150163
}
151164

@@ -158,9 +171,10 @@ public Company(String name, Address addressMain, Address addressPostal, String c
158171
* @param ubo The names and birth dates of the company's ultimate beneficiary owners. Minimum
159172
* zero, maximum four.
160173
* @param chamberOfCommerceNumber The company's chamber of commerce number.
174+
* @param subscriptionType The subscription type for the company.
161175
* @param avatarUuid The public UUID of the company's avatar.
162176
*/
163-
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String avatarUuid, Map<String, String> customHeaders) {
177+
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String subscriptionType, String avatarUuid, Map<String, String> customHeaders) {
164178
ApiClient apiClient = new ApiClient(getApiContext());
165179

166180
if (customHeaders == null) {
@@ -175,6 +189,7 @@ public static BunqResponse<Integer> create(String name, Address addressMain, Add
175189
requestMap.put(FIELD_UBO, ubo);
176190
requestMap.put(FIELD_CHAMBER_OF_COMMERCE_NUMBER, chamberOfCommerceNumber);
177191
requestMap.put(FIELD_LEGAL_FORM, legalForm);
192+
requestMap.put(FIELD_SUBSCRIPTION_TYPE, subscriptionType);
178193
requestMap.put(FIELD_AVATAR_UUID, avatarUuid);
179194

180195
byte[] requestBytes = determineAllRequestByte(requestMap);
@@ -184,39 +199,43 @@ public static BunqResponse<Integer> create(String name, Address addressMain, Add
184199
}
185200

186201
public static BunqResponse<Integer> create() {
187-
return create(null, null, null, null, null, null, null, null, null);
202+
return create(null, null, null, null, null, null, null, null, null, null);
188203
}
189204

190205
public static BunqResponse<Integer> create(String name) {
191-
return create(name, null, null, null, null, null, null, null, null);
206+
return create(name, null, null, null, null, null, null, null, null, null);
192207
}
193208

194209
public static BunqResponse<Integer> create(String name, Address addressMain) {
195-
return create(name, addressMain, null, null, null, null, null, null, null);
210+
return create(name, addressMain, null, null, null, null, null, null, null, null);
196211
}
197212

198213
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal) {
199-
return create(name, addressMain, addressPostal, null, null, null, null, null, null);
214+
return create(name, addressMain, addressPostal, null, null, null, null, null, null, null);
200215
}
201216

202217
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country) {
203-
return create(name, addressMain, addressPostal, country, null, null, null, null, null);
218+
return create(name, addressMain, addressPostal, country, null, null, null, null, null, null);
204219
}
205220

206221
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm) {
207-
return create(name, addressMain, addressPostal, country, legalForm, null, null, null, null);
222+
return create(name, addressMain, addressPostal, country, legalForm, null, null, null, null, null);
208223
}
209224

210225
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo) {
211-
return create(name, addressMain, addressPostal, country, legalForm, ubo, null, null, null);
226+
return create(name, addressMain, addressPostal, country, legalForm, ubo, null, null, null, null);
212227
}
213228

214229
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber) {
215-
return create(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, null, null);
230+
return create(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, null, null, null);
231+
}
232+
233+
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String subscriptionType) {
234+
return create(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, subscriptionType, null, null);
216235
}
217236

218-
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String avatarUuid) {
219-
return create(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, avatarUuid, null);
237+
public static BunqResponse<Integer> create(String name, Address addressMain, Address addressPostal, String country, String legalForm, List<Ubo> ubo, String chamberOfCommerceNumber, String subscriptionType, String avatarUuid) {
238+
return create(name, addressMain, addressPostal, country, legalForm, ubo, chamberOfCommerceNumber, subscriptionType, avatarUuid, null);
220239
}
221240

222241
/**

‎src/main/java/com/bunq/sdk/model/generated/endpoint/SandboxUser.java

-87
This file was deleted.

‎src/test/Resource/CHANGELOG.md

+39-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,44 @@
22

33
## [Unreleased](https://github.com/bunq/sdk_java/tree/HEAD)
44

5-
[Full Changelog](https://github.com/bunq/sdk_java/compare/1.13.1...HEAD)
5+
[Full Changelog](https://github.com/bunq/sdk_java/compare/1.14.1...HEAD)
6+
7+
**Implemented enhancements:**
8+
9+
- Replace /sandbox-user with /sandbox-user-person and /sandbox-user-company [\#137](https://github.com/bunq/sdk_java/issues/137)
10+
- feature/sdk\_java\#137 Deprecate sandbox-user. [\#138](https://github.com/bunq/sdk_java/pull/138) ([angelomelonas](https://github.com/angelomelonas))
11+
12+
**Fixed bugs:**
13+
14+
- Remove getUserObject call immediately after UserContext creation \(reduce rate-limit hits\) [\#134](https://github.com/bunq/sdk_java/issues/134)
15+
- feature/sdk\_java\#134 save/restore User in SessionContext from file [\#136](https://github.com/bunq/sdk_java/pull/136) ([angelomelonas](https://github.com/angelomelonas))
16+
- feature/sdk\_java\#134 Do not call getUser immediately after UserContext creation [\#135](https://github.com/bunq/sdk_java/pull/135) ([angelomelonas](https://github.com/angelomelonas))
17+
18+
## [1.14.1](https://github.com/bunq/sdk_java/tree/1.14.1) (2020-08-19)
19+
20+
[Full Changelog](https://github.com/bunq/sdk_java/compare/1.14.0...1.14.1)
21+
22+
**Implemented enhancements:**
23+
24+
- Update Java SDK dependencies [\#131](https://github.com/bunq/sdk_java/issues/131)
25+
26+
**Fixed bugs:**
27+
28+
- OauthAuthorizationUri creates incorrect URL [\#126](https://github.com/bunq/sdk_java/issues/126)
29+
- Fixed OauthAuthorizationUri not being correctly created [\#133](https://github.com/bunq/sdk_java/pull/133) ([angelomelonas](https://github.com/angelomelonas))
30+
31+
**Closed issues:**
32+
33+
- ExceptionInInitializerError in ApiContext.create [\#127](https://github.com/bunq/sdk_java/issues/127)
34+
- Update Okio dependency [\#120](https://github.com/bunq/sdk_java/issues/120)
35+
36+
**Merged pull requests:**
37+
38+
- Updated Java SDK dependencies [\#132](https://github.com/bunq/sdk_java/pull/132) ([angelomelonas](https://github.com/angelomelonas))
39+
40+
## [1.14.0](https://github.com/bunq/sdk_java/tree/1.14.0) (2020-07-28)
41+
42+
[Full Changelog](https://github.com/bunq/sdk_java/compare/1.13.1...1.14.0)
643

744
**Closed issues:**
845

@@ -184,7 +221,6 @@
184221
- Added missing id field from mastercard action. \(bunq/sdk\_java\#48\) [\#62](https://github.com/bunq/sdk_java/pull/62) ([OGKevin](https://github.com/OGKevin))
185222
- \(bunq/sdk\_java\#55\) add response id to request error [\#61](https://github.com/bunq/sdk_java/pull/61) ([OGKevin](https://github.com/OGKevin))
186223
- Configure Zappr [\#59](https://github.com/bunq/sdk_java/pull/59) ([OGKevin](https://github.com/OGKevin))
187-
- Improve issue and pr template. \(bunq/sdk\_java\#56\) [\#57](https://github.com/bunq/sdk_java/pull/57) ([OGKevin](https://github.com/OGKevin))
188224

189225
## [0.12.4](https://github.com/bunq/sdk_java/tree/0.12.4) (2017-12-21)
190226

@@ -203,6 +239,7 @@
203239

204240
**Merged pull requests:**
205241

242+
- Improve issue and pr template. \(bunq/sdk\_java\#56\) [\#57](https://github.com/bunq/sdk_java/pull/57) ([OGKevin](https://github.com/OGKevin))
206243
- Added method to ensure that reponse headers are correclty cased befor… [\#53](https://github.com/bunq/sdk_java/pull/53) ([OGKevin](https://github.com/OGKevin))
207244
- Feature/improve decoder bunq/sdk java\#35 [\#52](https://github.com/bunq/sdk_java/pull/52) ([OGKevin](https://github.com/OGKevin))
208245

0 commit comments

Comments
 (0)