Skip to content

Commit 1d29d68

Browse files
author
system-mr
committed
ran make services (ignoring checkout) and fix UTs
1 parent c99ba89 commit 1d29d68

File tree

8 files changed

+2969
-91
lines changed

8 files changed

+2969
-91
lines changed

src/main/java/com/adyen/model/binlookup/DSPublicKeyDetail.java

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
DSPublicKeyDetail.JSON_PROPERTY_BRAND,
3636
DSPublicKeyDetail.JSON_PROPERTY_DIRECTORY_SERVER_ID,
3737
DSPublicKeyDetail.JSON_PROPERTY_FROM_S_D_K_VERSION,
38-
DSPublicKeyDetail.JSON_PROPERTY_PUBLIC_KEY
38+
DSPublicKeyDetail.JSON_PROPERTY_PUBLIC_KEY,
39+
DSPublicKeyDetail.JSON_PROPERTY_ROOT_CERTIFICATES
3940
})
4041

4142
public class DSPublicKeyDetail {
@@ -51,6 +52,9 @@ public class DSPublicKeyDetail {
5152
public static final String JSON_PROPERTY_PUBLIC_KEY = "publicKey";
5253
private byte[] publicKey;
5354

55+
public static final String JSON_PROPERTY_ROOT_CERTIFICATES = "rootCertificates";
56+
private String rootCertificates;
57+
5458
public DSPublicKeyDetail() {
5559
}
5660

@@ -154,6 +158,31 @@ public void setPublicKey(byte[] publicKey) {
154158
}
155159

156160

161+
public DSPublicKeyDetail rootCertificates(String rootCertificates) {
162+
this.rootCertificates = rootCertificates;
163+
return this;
164+
}
165+
166+
/**
167+
* Directory Server root certificates. The 3D Secure 2 SDK verifies the ACS signed content using the rootCertificates.
168+
* @return rootCertificates
169+
**/
170+
@ApiModelProperty(value = "Directory Server root certificates. The 3D Secure 2 SDK verifies the ACS signed content using the rootCertificates.")
171+
@JsonProperty(JSON_PROPERTY_ROOT_CERTIFICATES)
172+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
173+
174+
public String getRootCertificates() {
175+
return rootCertificates;
176+
}
177+
178+
179+
@JsonProperty(JSON_PROPERTY_ROOT_CERTIFICATES)
180+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
181+
public void setRootCertificates(String rootCertificates) {
182+
this.rootCertificates = rootCertificates;
183+
}
184+
185+
157186
/**
158187
* Return true if this DSPublicKeyDetail object is equal to o.
159188
*/
@@ -169,12 +198,13 @@ public boolean equals(Object o) {
169198
return Objects.equals(this.brand, dsPublicKeyDetail.brand) &&
170199
Objects.equals(this.directoryServerId, dsPublicKeyDetail.directoryServerId) &&
171200
Objects.equals(this.fromSDKVersion, dsPublicKeyDetail.fromSDKVersion) &&
172-
Arrays.equals(this.publicKey, dsPublicKeyDetail.publicKey);
201+
Arrays.equals(this.publicKey, dsPublicKeyDetail.publicKey) &&
202+
Objects.equals(this.rootCertificates, dsPublicKeyDetail.rootCertificates);
173203
}
174204

175205
@Override
176206
public int hashCode() {
177-
return Objects.hash(brand, directoryServerId, fromSDKVersion, Arrays.hashCode(publicKey));
207+
return Objects.hash(brand, directoryServerId, fromSDKVersion, Arrays.hashCode(publicKey), rootCertificates);
178208
}
179209

180210
@Override
@@ -185,6 +215,7 @@ public String toString() {
185215
sb.append(" directoryServerId: ").append(toIndentedString(directoryServerId)).append("\n");
186216
sb.append(" fromSDKVersion: ").append(toIndentedString(fromSDKVersion)).append("\n");
187217
sb.append(" publicKey: ").append(toIndentedString(publicKey)).append("\n");
218+
sb.append(" rootCertificates: ").append(toIndentedString(rootCertificates)).append("\n");
188219
sb.append("}");
189220
return sb.toString();
190221
}
Lines changed: 283 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,283 @@
1+
/*
2+
* Adyen Checkout API
3+
*
4+
* The version of the OpenAPI document: 70
5+
*
6+
*
7+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
8+
* https://openapi-generator.tech
9+
* Do not edit the class manually.
10+
*/
11+
12+
13+
package com.adyen.model.checkout;
14+
15+
import java.util.Objects;
16+
import java.util.Arrays;
17+
import java.util.Map;
18+
import java.util.HashMap;
19+
import com.fasterxml.jackson.annotation.JsonInclude;
20+
import com.fasterxml.jackson.annotation.JsonProperty;
21+
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonTypeName;
23+
import com.fasterxml.jackson.annotation.JsonValue;
24+
import io.swagger.annotations.ApiModel;
25+
import io.swagger.annotations.ApiModelProperty;
26+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
27+
import com.fasterxml.jackson.core.JsonProcessingException;
28+
29+
30+
/**
31+
* BillingAddress
32+
*/
33+
@JsonPropertyOrder({
34+
BillingAddress.JSON_PROPERTY_CITY,
35+
BillingAddress.JSON_PROPERTY_COUNTRY,
36+
BillingAddress.JSON_PROPERTY_HOUSE_NUMBER_OR_NAME,
37+
BillingAddress.JSON_PROPERTY_POSTAL_CODE,
38+
BillingAddress.JSON_PROPERTY_STATE_OR_PROVINCE,
39+
BillingAddress.JSON_PROPERTY_STREET
40+
})
41+
42+
public class BillingAddress {
43+
public static final String JSON_PROPERTY_CITY = "city";
44+
private String city;
45+
46+
public static final String JSON_PROPERTY_COUNTRY = "country";
47+
private String country;
48+
49+
public static final String JSON_PROPERTY_HOUSE_NUMBER_OR_NAME = "houseNumberOrName";
50+
private String houseNumberOrName;
51+
52+
public static final String JSON_PROPERTY_POSTAL_CODE = "postalCode";
53+
private String postalCode;
54+
55+
public static final String JSON_PROPERTY_STATE_OR_PROVINCE = "stateOrProvince";
56+
private String stateOrProvince;
57+
58+
public static final String JSON_PROPERTY_STREET = "street";
59+
private String street;
60+
61+
public BillingAddress() {
62+
}
63+
64+
public BillingAddress city(String city) {
65+
this.city = city;
66+
return this;
67+
}
68+
69+
/**
70+
* The name of the city. Maximum length: 3000 characters.
71+
* @return city
72+
**/
73+
@ApiModelProperty(required = true, value = "The name of the city. Maximum length: 3000 characters.")
74+
@JsonProperty(JSON_PROPERTY_CITY)
75+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
76+
77+
public String getCity() {
78+
return city;
79+
}
80+
81+
82+
@JsonProperty(JSON_PROPERTY_CITY)
83+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
84+
public void setCity(String city) {
85+
this.city = city;
86+
}
87+
88+
89+
public BillingAddress country(String country) {
90+
this.country = country;
91+
return this;
92+
}
93+
94+
/**
95+
* The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
96+
* @return country
97+
**/
98+
@ApiModelProperty(required = true, value = "The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.")
99+
@JsonProperty(JSON_PROPERTY_COUNTRY)
100+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
101+
102+
public String getCountry() {
103+
return country;
104+
}
105+
106+
107+
@JsonProperty(JSON_PROPERTY_COUNTRY)
108+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
109+
public void setCountry(String country) {
110+
this.country = country;
111+
}
112+
113+
114+
public BillingAddress houseNumberOrName(String houseNumberOrName) {
115+
this.houseNumberOrName = houseNumberOrName;
116+
return this;
117+
}
118+
119+
/**
120+
* The number or name of the house. Maximum length: 3000 characters.
121+
* @return houseNumberOrName
122+
**/
123+
@ApiModelProperty(required = true, value = "The number or name of the house. Maximum length: 3000 characters.")
124+
@JsonProperty(JSON_PROPERTY_HOUSE_NUMBER_OR_NAME)
125+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
126+
127+
public String getHouseNumberOrName() {
128+
return houseNumberOrName;
129+
}
130+
131+
132+
@JsonProperty(JSON_PROPERTY_HOUSE_NUMBER_OR_NAME)
133+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
134+
public void setHouseNumberOrName(String houseNumberOrName) {
135+
this.houseNumberOrName = houseNumberOrName;
136+
}
137+
138+
139+
public BillingAddress postalCode(String postalCode) {
140+
this.postalCode = postalCode;
141+
return this;
142+
}
143+
144+
/**
145+
* A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
146+
* @return postalCode
147+
**/
148+
@ApiModelProperty(required = true, value = "A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.")
149+
@JsonProperty(JSON_PROPERTY_POSTAL_CODE)
150+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
151+
152+
public String getPostalCode() {
153+
return postalCode;
154+
}
155+
156+
157+
@JsonProperty(JSON_PROPERTY_POSTAL_CODE)
158+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
159+
public void setPostalCode(String postalCode) {
160+
this.postalCode = postalCode;
161+
}
162+
163+
164+
public BillingAddress stateOrProvince(String stateOrProvince) {
165+
this.stateOrProvince = stateOrProvince;
166+
return this;
167+
}
168+
169+
/**
170+
* The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
171+
* @return stateOrProvince
172+
**/
173+
@ApiModelProperty(value = "The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.")
174+
@JsonProperty(JSON_PROPERTY_STATE_OR_PROVINCE)
175+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
176+
177+
public String getStateOrProvince() {
178+
return stateOrProvince;
179+
}
180+
181+
182+
@JsonProperty(JSON_PROPERTY_STATE_OR_PROVINCE)
183+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
184+
public void setStateOrProvince(String stateOrProvince) {
185+
this.stateOrProvince = stateOrProvince;
186+
}
187+
188+
189+
public BillingAddress street(String street) {
190+
this.street = street;
191+
return this;
192+
}
193+
194+
/**
195+
* The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
196+
* @return street
197+
**/
198+
@ApiModelProperty(required = true, value = "The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.")
199+
@JsonProperty(JSON_PROPERTY_STREET)
200+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
201+
202+
public String getStreet() {
203+
return street;
204+
}
205+
206+
207+
@JsonProperty(JSON_PROPERTY_STREET)
208+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
209+
public void setStreet(String street) {
210+
this.street = street;
211+
}
212+
213+
214+
/**
215+
* Return true if this BillingAddress object is equal to o.
216+
*/
217+
@Override
218+
public boolean equals(Object o) {
219+
if (this == o) {
220+
return true;
221+
}
222+
if (o == null || getClass() != o.getClass()) {
223+
return false;
224+
}
225+
BillingAddress billingAddress = (BillingAddress) o;
226+
return Objects.equals(this.city, billingAddress.city) &&
227+
Objects.equals(this.country, billingAddress.country) &&
228+
Objects.equals(this.houseNumberOrName, billingAddress.houseNumberOrName) &&
229+
Objects.equals(this.postalCode, billingAddress.postalCode) &&
230+
Objects.equals(this.stateOrProvince, billingAddress.stateOrProvince) &&
231+
Objects.equals(this.street, billingAddress.street);
232+
}
233+
234+
@Override
235+
public int hashCode() {
236+
return Objects.hash(city, country, houseNumberOrName, postalCode, stateOrProvince, street);
237+
}
238+
239+
@Override
240+
public String toString() {
241+
StringBuilder sb = new StringBuilder();
242+
sb.append("class BillingAddress {\n");
243+
sb.append(" city: ").append(toIndentedString(city)).append("\n");
244+
sb.append(" country: ").append(toIndentedString(country)).append("\n");
245+
sb.append(" houseNumberOrName: ").append(toIndentedString(houseNumberOrName)).append("\n");
246+
sb.append(" postalCode: ").append(toIndentedString(postalCode)).append("\n");
247+
sb.append(" stateOrProvince: ").append(toIndentedString(stateOrProvince)).append("\n");
248+
sb.append(" street: ").append(toIndentedString(street)).append("\n");
249+
sb.append("}");
250+
return sb.toString();
251+
}
252+
253+
/**
254+
* Convert the given object to string with each line indented by 4 spaces
255+
* (except the first line).
256+
*/
257+
private String toIndentedString(Object o) {
258+
if (o == null) {
259+
return "null";
260+
}
261+
return o.toString().replace("\n", "\n ");
262+
}
263+
264+
/**
265+
* Create an instance of BillingAddress given an JSON string
266+
*
267+
* @param jsonString JSON string
268+
* @return An instance of BillingAddress
269+
* @throws JsonProcessingException if the JSON string is invalid with respect to BillingAddress
270+
*/
271+
public static BillingAddress fromJson(String jsonString) throws JsonProcessingException {
272+
return JSON.getMapper().readValue(jsonString, BillingAddress.class);
273+
}
274+
/**
275+
* Convert an instance of BillingAddress to an JSON string
276+
*
277+
* @return JSON string
278+
*/
279+
public String toJson() throws JsonProcessingException {
280+
return JSON.getMapper().writeValueAsString(this);
281+
}
282+
}
283+

0 commit comments

Comments
 (0)