Skip to content

Commit 0400eea

Browse files
michaelpaulmichaelpaul
authored
Merge pull request #955 from Adyen/develop
Release 19.0.0-beta
2 parents af05be5 + a30e893 commit 0400eea

File tree

1,137 files changed

+279628
-51654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,137 files changed

+279628
-51654
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @AlexandrosMor @wboereboom @Morerice @michaelpaul
1+
* @AlexandrosMor @wboereboom @Morerice @michaelpaul @jillingk @antolo-arch

‎.github/dependabot.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.github/release.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
changelog:
2+
categories:
3+
- title: Breaking Changes 🛠
4+
labels:
5+
- Breaking change
6+
- title: New Features 💎
7+
labels:
8+
- Feature
9+
- title: Fixes ⛑️
10+
labels:
11+
- Fix
12+
- title: Other Changes 🖇️
13+
labels:
14+
- "*"

‎.openapi-generator-ignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ openapi-generator-cli:=java -jar $(openapi-generator-jar)
55

66
generator:=java
77
library:=okhttp-gson
8-
services:=payments checkout
8+
services:=balanceplatform binlookup checkout legalentitymanagement management payments payout recurring transfers
99
models:=src/main/java/com/adyen/model
1010
output:=target/out
1111

12-
1312
# Generate models (for each service)
1413
models: $(services)
1514

@@ -21,8 +20,10 @@ payments: spec=PaymentService-v68
2120
recurring: spec=RecurringService-v68
2221
payout: spec=PayoutService-v68
2322
management: spec=ManagementService-v1
23+
management: resourceClass=Management
2424
balanceplatform: spec=BalancePlatformService-v2
2525
transfers: spec=TransferService-v3
26+
legalentitymanagement: spec=LegalEntityService-v2
2627
# Classic Platforms
2728
marketpay/account: spec=AccountService-v6
2829
marketpay/fund: spec=FundService-v6
@@ -37,13 +38,17 @@ $(services): target/spec $(openapi-generator-jar)
3738
-g $(generator) \
3839
-t templates \
3940
-o $(output) \
41+
--reserved-words-mappings configuration=configuration \
4042
--ignore-file-override ./.openapi-generator-ignore \
4143
--skip-validate-spec \
4244
--model-package $(subst /,.,com.adyen.model.$@) \
4345
--library $(library) \
4446
--global-property modelDocs=false \
4547
--global-property modelTests=false \
46-
--additional-properties=dateLibrary=legacy
48+
--additional-properties=dateLibrary=java8 \
49+
--additional-properties=serializationLibrary=gson \
50+
--additional-properties=openApiNullable=false \
51+
--additional-properties=resourceClass=$(resourceClass)Resource
4752
mv $(output)/$(models)/$@ $(models)/$@
4853
mv $(output)/$(models)/JSON.java $(models)/$@
4954

‎README.md

Lines changed: 112 additions & 57 deletions
Large diffs are not rendered by default.

‎checkstyle.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
<module name="BeforeExecutionExclusionFileFilter">
4646
<property name="fileNamePattern" value="model[\\/].*$"/>
4747
</module>
48+
<!-- Ignore generated service classes -->
49+
<module name="BeforeExecutionExclusionFileFilter">
50+
<property name="fileNamePattern" value="service[\\/]management"/>
51+
</module>
4852

4953
<!-- Checks that a package-info.java file exists for each package. -->
5054
<!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->

‎pom.xml

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.adyen</groupId>
55
<artifactId>adyen-java-api-library</artifactId>
66
<packaging>jar</packaging>
7-
<version>18.1.3</version>
7+
<version>19.0.0-beta</version>
88
<name>Adyen Java API Library</name>
99
<description>Adyen API Client Library for Java</description>
1010
<url>https://github.com/adyen/adyen-java-api-library</url>
@@ -25,7 +25,7 @@
2525
<properties>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
28-
<swagger-core-version>1.6.8</swagger-core-version>
28+
<swagger-core-version>1.6.9</swagger-core-version>
2929
</properties>
3030
<scm>
3131
<connection>scm:git:[email protected]:Adyen/adyen-java-api-library.git</connection>
@@ -135,7 +135,7 @@
135135
<plugin>
136136
<groupId>org.apache.maven.plugins</groupId>
137137
<artifactId>maven-checkstyle-plugin</artifactId>
138-
<version>3.2.0</version>
138+
<version>3.2.1</version>
139139
<configuration>
140140
<configLocation>checkstyle.xml</configLocation>
141141
<consoleOutput>true</consoleOutput>
@@ -177,26 +177,19 @@
177177
<groupId>commons-codec</groupId>
178178
<artifactId>commons-codec</artifactId>
179179
<version>1.15</version>
180+
<scope>compile</scope>
180181
</dependency>
181182
<dependency>
182183
<groupId>com.google.code.gson</groupId>
183184
<artifactId>gson</artifactId>
184-
<version>2.9.1</version>
185-
</dependency>
186-
<dependency>
187-
<groupId>com.fasterxml.jackson.core</groupId>
188-
<artifactId>jackson-annotations</artifactId>
189-
<version>2.13.4</version>
190-
</dependency>
191-
<dependency>
192-
<groupId>com.fasterxml.jackson.core</groupId>
193-
<artifactId>jackson-databind</artifactId>
194-
<version>2.13.4.2</version>
185+
<version>2.10.1</version>
186+
<scope>compile</scope>
195187
</dependency>
196188
<dependency>
197189
<groupId>org.apache.httpcomponents.client5</groupId>
198190
<artifactId>httpclient5</artifactId>
199-
<version>5.1.3</version>
191+
<version>5.2.1</version>
192+
<scope>compile</scope>
200193
</dependency>
201194
<dependency>
202195
<groupId>junit</groupId>
@@ -207,56 +200,45 @@
207200
<dependency>
208201
<groupId>org.mockito</groupId>
209202
<artifactId>mockito-core</artifactId>
210-
<version>4.8.0</version>
211-
<scope>test</scope>
212-
</dependency>
213-
<dependency>
214-
<groupId>com.fasterxml.jackson.datatype</groupId>
215-
<artifactId>jackson-datatype-jdk8</artifactId>
216-
<version>2.13.4</version>
203+
<version>5.0.0</version>
217204
<scope>test</scope>
218205
</dependency>
219206
<dependency>
220207
<groupId>javax.xml.bind</groupId>
221208
<artifactId>jaxb-api</artifactId>
222209
<version>2.3.1</version>
223-
</dependency>
224-
<dependency>
225-
<groupId>io.swagger.core.v3</groupId>
226-
<artifactId>swagger-models</artifactId>
227-
<version>2.2.4</version>
210+
<scope>compile</scope>
228211
</dependency>
229212
<dependency>
230213
<groupId>io.swagger.core.v3</groupId>
231214
<artifactId>swagger-annotations</artifactId>
232-
<version>2.2.4</version>
215+
<version>2.2.8</version>
216+
<scope>compile</scope>
233217
</dependency>
234218
<dependency>
235-
<groupId>javax.ws.rs</groupId>
236-
<artifactId>javax.ws.rs-api</artifactId>
237-
<version>2.1.1</version>
219+
<groupId>jakarta.ws.rs</groupId>
220+
<artifactId>jakarta.ws.rs-api</artifactId>
221+
<version>2.1.6</version>
222+
<scope>compile</scope>
238223
</dependency>
239224
<dependency>
240225
<groupId>io.gsonfire</groupId>
241226
<artifactId>gson-fire</artifactId>
242227
<version>1.8.5</version>
228+
<scope>compile</scope>
243229
</dependency>
244230
<dependency>
245231
<groupId>com.squareup.okio</groupId>
246232
<artifactId>okio</artifactId>
247-
<version>3.2.0</version>
233+
<version>3.3.0</version>
234+
<scope>test</scope>
248235
</dependency>
249236
<!-- Generated model annotations -->
250237
<dependency>
251238
<groupId>io.swagger</groupId>
252239
<artifactId>swagger-annotations</artifactId>
253240
<version>${swagger-core-version}</version>
254-
</dependency>
255-
<!-- @Nullable annotation -->
256-
<dependency>
257-
<groupId>com.google.code.findbugs</groupId>
258-
<artifactId>jsr305</artifactId>
259-
<version>3.0.2</version>
241+
<scope>compile</scope>
260242
</dependency>
261243
</dependencies>
262244
</project>

‎src/main/java/com/adyen/Client.java

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ public class Client {
3939
public static final String HPP_LIVE = "https://live.adyen.com/hpp";
4040
public static final String MARKETPAY_ENDPOINT_TEST = "https://cal-test.adyen.com/cal/services";
4141
public static final String MARKETPAY_ENDPOINT_LIVE = "https://cal-live.adyen.com/cal/services";
42-
public static final String API_VERSION = "v52";
43-
public static final String PAYOUT_API_VERSION = "v51";
44-
public static final String RECURRING_API_VERSION = "v49";
42+
public static final String API_VERSION = "v68";
43+
public static final String PAYOUT_API_VERSION = "v68";
44+
public static final String RECURRING_API_VERSION = "v68";
4545
public static final String MARKETPAY_ACCOUNT_API_VERSION = "v6";
4646
public static final String MARKETPAY_FUND_API_VERSION = "v6";
4747
public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v6";
4848
public static final String MARKETPAY_HOP_API_VERSION = "v6";
4949
public static final String LIB_NAME = "adyen-java-api-library";
50-
public static final String LIB_VERSION = "18.1.3";
50+
public static final String LIB_VERSION = "19.0.0-beta";
5151
public static final String CHECKOUT_ENDPOINT_TEST = "https://checkout-test.adyen.com/checkout";
5252
public static final String CHECKOUT_ENDPOINT_LIVE_SUFFIX = "-checkout-live.adyenpayments.com/checkout";
5353
public static final String CHECKOUT_ENDPOINT_CERT_LIVE = "https://checkoutcert-live-%s.adyen.com/checkout";
5454
public static final String CHECKOUT_API_VERSION = "v69";
5555
public static final String CHECKOUT_STORED_PAYMENT_METHODS_VERSION = "v65";
5656
public static final String BIN_LOOKUP_PAL_SUFFIX = "/pal/servlet/BinLookup/";
57-
public static final String BIN_LOOKUP_API_VERSION = "v50";
57+
public static final String BIN_LOOKUP_API_VERSION = "v52";
5858
public static final String CHECKOUT_UTILITY_API_VERSION = "v1";
5959
public static final String TERMINAL_API_ENDPOINT_TEST = "https://terminal-api-test.adyen.com";
6060
public static final String TERMINAL_API_ENDPOINT_LIVE = "https://terminal-api-live.adyen.com";
@@ -67,6 +67,16 @@ public class Client {
6767
public static final String DATA_PROTECTION_ENDPOINT_LIVE = "https://ca-live.adyen.com/ca/services/DataProtectionService";
6868
public static final String POS_TERMINAL_MANAGEMENT_VERSION = "v1";
6969
public static final String DATA_PROTECTION_VERSION = "v1";
70+
public static final String BALANCE_PLATFORM_ENDPOINT_TEST = "https://balanceplatform-api-test.adyen.com";
71+
public static final String BALANCE_PLATFORM_ENDPOINT_LIVE = "https://balanceplatform-api-live.adyen.com";
72+
public static final String BALANCE_PLATFORM_VERSION = "v2";
73+
public static final String TRANSFER_VERSION = "v3";
74+
public static final String LEGAL_ENTITY_MANAGEMENT_ENDPOINT_TEST = "https://kyc-test.adyen.com/lem/";
75+
public static final String LEGAL_ENTITY_MANAGEMENT_ENDPOINT_LIVE = "https://kyc-test.adyen.com/lem/";
76+
public static final String LEGAL_ENTITY_MANAGEMENT_VERSION = "v2";
77+
public static final String MANAGEMENT_ENDPOINT_TEST = "https://management-test.adyen.com/";
78+
public static final String MANAGEMENT_ENDPOINT_LIVE = "https://management-live.adyen.com/";
79+
public static final String MANAGEMENT_VERSION = "v1";
7080

7181
public Client() {
7282
this.config = new Config();
@@ -202,6 +212,9 @@ public void setEnvironment(Environment environment, String liveEndpointUrlPrefix
202212
this.config.setTerminalApiCloudEndpoint(TERMINAL_API_ENDPOINT_TEST);
203213
this.config.setPosTerminalManagementApiEndpoint(POS_TERMINAL_MANAGEMENT_ENDPOINT_TEST);
204214
this.config.setDataProtectionEndpoint(DATA_PROTECTION_ENDPOINT_TEST);
215+
this.config.setBalancePlatformEndpoint(BALANCE_PLATFORM_ENDPOINT_TEST);
216+
this.config.setLegalEntityManagementEndpoint(LEGAL_ENTITY_MANAGEMENT_ENDPOINT_TEST);
217+
this.config.setManagementEndpoint(MANAGEMENT_ENDPOINT_TEST);
205218
} else if (Environment.LIVE.equals(environment)) {
206219
this.config.setEnvironment(environment);
207220
this.config.setMarketPayEndpoint(MARKETPAY_ENDPOINT_LIVE);
@@ -213,9 +226,12 @@ public void setEnvironment(Environment environment, String liveEndpointUrlPrefix
213226
this.config.setEndpoint(ENDPOINT_LIVE);
214227
this.config.setCheckoutEndpoint(null);
215228
}
229+
this.config.setBalancePlatformEndpoint(BALANCE_PLATFORM_ENDPOINT_LIVE);
216230
this.config.setTerminalApiCloudEndpoint(TERMINAL_API_ENDPOINT_LIVE);
217231
this.config.setPosTerminalManagementApiEndpoint(POS_TERMINAL_MANAGEMENT_ENDPOINT_LIVE);
218232
this.config.setDataProtectionEndpoint(DATA_PROTECTION_ENDPOINT_LIVE);
233+
this.config.setLegalEntityManagementEndpoint(LEGAL_ENTITY_MANAGEMENT_ENDPOINT_LIVE);
234+
this.config.setManagementEndpoint(MANAGEMENT_ENDPOINT_LIVE);
219235
}
220236
}
221237

‎src/main/java/com/adyen/Config.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class Config {
3939
protected Environment environment;
4040
protected String endpoint;
4141
protected String marketPayEndpoint;
42+
protected String balancePlatformEndpoint;
4243
/**
4344
* Application name: used as HTTP client User-Agent
4445
*/
@@ -69,6 +70,8 @@ public class Config {
6970
protected KeyStore trustKeyStore;
7071
protected KeyStore clientKeyStore;
7172
protected String clientKeyStorePassword;
73+
protected String legalEntityManagementEndpoint;
74+
protected String managementEndpoint;
7275

7376
public Config() {
7477
// do nothing
@@ -270,4 +273,28 @@ public String getClientKeyStorePassword() {
270273
public void setClientKeyStorePassword(String clientKeyStorePassword) {
271274
this.clientKeyStorePassword = clientKeyStorePassword;
272275
}
276+
277+
public String getBalancePlatformEndpoint() {
278+
return balancePlatformEndpoint;
279+
}
280+
281+
public void setBalancePlatformEndpoint(String balancePlatformEndpoint) {
282+
this.balancePlatformEndpoint = balancePlatformEndpoint;
283+
}
284+
285+
public String getLegalManagementEndpoint() {
286+
return legalEntityManagementEndpoint;
287+
}
288+
289+
public void setLegalEntityManagementEndpoint(String legalEntityManagementEndpoint) {
290+
this.legalEntityManagementEndpoint = legalEntityManagementEndpoint;
291+
}
292+
293+
public String getManagementEndpoint() {
294+
return managementEndpoint;
295+
}
296+
297+
public void setManagementEndpoint(String managementEndpoint) {
298+
this.managementEndpoint = managementEndpoint;
299+
}
273300
}

0 commit comments

Comments
 (0)