Skip to content

Commit b647fae

Browse files
jillingkjillingk
authored
Merge pull request #1098 from Adyen/develop
Release v21.0.0
2 parents 773c8e3 + c491d60 commit b647fae

File tree

1,313 files changed

+78093
-194160
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,313 files changed

+78093
-194160
lines changed

Diff for: ‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @Adyen/api-libraries-reviewers
1+
* @Adyen/integration-tools-testing

Diff for: ‎.github/workflows/javaci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ on: [push]
55
jobs:
66
build:
77
runs-on: ubuntu-latest
8-
8+
strategy:
9+
matrix:
10+
java: [ '11', '17', '20' ]
911
steps:
1012
- uses: actions/checkout@v3
11-
- name: Set up JDK 11
13+
- name: Set up JDK ${{ matrix.Java }}
1214
uses: actions/setup-java@v3
1315

1416
with:
15-
java-version: '11'
17+
java-version: ${{ matrix.java }}
1618
distribution: 'adopt'
1719

1820
- name: Run the tests with Maven
19-
run: mvn -B test --no-transfer-progress
21+
run: mvn -B clean test package --no-transfer-progress

Diff for: ‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
rm -f ./.github/scripts/release.js
4444
- name: Create Pull Request
4545
id: cpr
46-
uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666 # v5.0.1
46+
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
4747
with:
4848
token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
4949
committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}

Diff for: ‎.github/workflows/services.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Java Library Services + Models
2+
3+
on: [ workflow_dispatch ]
4+
5+
jobs:
6+
generate:
7+
runs-on: ubuntu-latest
8+
name: Generate Models + Services
9+
steps:
10+
- uses: actions/checkout@v3
11+
- run: make services
12+
- name: Set PR variables
13+
id: vars
14+
run: |
15+
cd target/spec
16+
echo ::set-output name=pr_title::"Update models + services"
17+
echo ::set-output name=pr_body::"OpenAPI spec or templates produced new models + services on $(date +%d-%m-%Y) \
18+
by [commit](https://github.com/Adyen/adyen-openapi/commit/$(git rev-parse HEAD))."
19+
- name: Create Pull Request
20+
uses: peter-evans/create-pull-request@v5
21+
with:
22+
token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
23+
committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
24+
author: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
25+
base: develop
26+
branch: automation/services
27+
title: ${{ steps.vars.outputs.pr_title }}
28+
body: ${{ steps.vars.outputs.pr_body }}
29+
add-paths: |
30+
src/main/java/com/adyen/model
31+
src/main/java/com/adyen/service

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.iml
33
/target/**
44
.DS_Store
5+
.vscode

Diff for: ‎Makefile

+7-12
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ openapi-generator-jar:=target/openapi-generator-cli.jar
44
openapi-generator-cli:=java -jar $(openapi-generator-jar)
55

66
generator:=java
7-
library:=okhttp-gson
8-
modelGen:=balancecontrol balanceplatform binlookup capital checkout dataprotection legalentitymanagement management payment payout posterminalmanagement recurring transfers storedvalue configurationwebhooks reportwebhooks transferwebhooks
7+
library:=jersey3
8+
modelGen:=balancecontrol balanceplatform binlookup checkout dataprotection legalentitymanagement management payment payout posterminalmanagement recurring transfers storedvalue configurationwebhooks reportwebhooks transferwebhooks
99
models:=src/main/java/com/adyen/model
1010
output:=target/out
1111

@@ -19,8 +19,6 @@ binlookup: smallServiceName=BinLookupApi
1919
checkout: spec=CheckoutService-v70
2020
dataprotection: spec=DataProtectionService-v1
2121
dataprotection: smallServiceName=DataProtectionApi
22-
capital: spec=GrantService-v3
23-
capital: smallServiceName=CapitalApi
2422
storedvalue: spec=StoredValueService-v46
2523
storedvalue: smallServiceName=StoredValueApi
2624
posterminalmanagement: spec=TfmAPIService-v1
@@ -59,17 +57,16 @@ $(modelGen): target/spec $(openapi-generator-jar)
5957
--library $(library) \
6058
--global-property modelDocs=false \
6159
--global-property modelTests=false \
62-
--inline-schema-name-mappings PaymentDonationRequest_paymentMethod=CheckoutPaymentMethod \
60+
--inline-schema-name-mappings DonationPaymentRequest_paymentMethod=CheckoutPaymentMethod \
6361
--additional-properties=dateLibrary=java8 \
64-
--additional-properties=serializationLibrary=gson \
6562
--additional-properties=openApiNullable=false \
6663
--additional-properties=resourceClass=$(resourceClass)Resource
6764
mv $(output)/$(models)/$@ $(models)/$@
6865
mv $(output)/$(models)/JSON.java $(models)/$@
6966

7067
# Full service + models automation
7168
bigServices:=balanceplatform checkout payout management legalentitymanagement transfers
72-
singleFileServices:=balancecontrol binlookup dataprotection storedvalue posterminalmanagement recurring payment capital
69+
singleFileServices:=balancecontrol binlookup dataprotection storedvalue posterminalmanagement recurring payment
7370

7471
services: $(bigServices) $(singleFileServices)
7572

@@ -90,9 +87,8 @@ $(bigServices): target/spec $(openapi-generator-jar)
9087
--api-name-suffix Api \
9188
--global-property modelDocs=false \
9289
--global-property modelTests=false \
93-
--inline-schema-name-mappings PaymentDonationRequest_paymentMethod=CheckoutPaymentMethod \
90+
--inline-schema-name-mappings DonationPaymentRequest_paymentMethod=CheckoutPaymentMethod \
9491
--additional-properties=dateLibrary=java8 \
95-
--additional-properties=serializationLibrary=gson \
9692
--additional-properties=openApiNullable=false
9793
mv $(output)/$(models)/$@ $(models)/$@
9894
mv $(output)/src/main/java/com/adyen/service/JSON.java $(models)/$@
@@ -106,7 +102,7 @@ $(singleFileServices): target/spec $(openapi-generator-jar)
106102
$(openapi-generator-cli) generate \
107103
-i target/spec/json/$(spec).json \
108104
-g $(generator) \
109-
-c templates/libraries/okhttp-gson/config.yaml \
105+
-c templates/libraries/jersey3/config.yaml \
110106
-o $(output) \
111107
--reserved-words-mappings configuration=configuration \
112108
--ignore-file-override ./.openapi-generator-ignore \
@@ -118,9 +114,8 @@ $(singleFileServices): target/spec $(openapi-generator-jar)
118114
--api-name-suffix Api \
119115
--global-property modelDocs=false \
120116
--global-property modelTests=false \
121-
--inline-schema-name-mappings PaymentDonationRequest_paymentMethod=CheckoutPaymentMethod \
117+
--inline-schema-name-mappings DonationPaymentRequest_paymentMethod=CheckoutPaymentMethod \
122118
--additional-properties=dateLibrary=java8 \
123-
--additional-properties=serializationLibrary=gson \
124119
--additional-properties=openApiNullable=false \
125120
--additional-properties=smallServiceName=$(smallServiceName)
126121
mv $(output)/$(models)/$@ $(models)/$@

Diff for: ‎README.md

+9-12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# Adyen Java API Library
44

5+
[![Maven Central](https://img.shields.io/maven-central/v/com.adyen/adyen-java-api-library)](https://central.sonatype.com/artifact/com.adyen/adyen-java-api-library/)
6+
57
This is the officially supported Java library for using Adyen's APIs.
68

79
## Supported API versions
@@ -13,20 +15,15 @@ The Library supports all APIs under the following services:
1315
| [BIN lookup API](https://docs.adyen.com/api-explorer/BinLookup/54/overview) | The BIN Lookup API provides endpoints for retrieving information based on a given BIN. | BinLookup | **v54** |
1416
| [Capital API](https://docs.adyen.com/api-explorer/capital/3/overview) | Adyen Capital allows you to build an embedded financing offering for your users to serve their operational needs. | Capital | **v3** |
1517
| [Checkout API](https://docs.adyen.com/api-explorer/Checkout/70/overview) | Our latest integration for accepting online payments. | Checkout | **v70** |
16-
| [Configuration API](https://docs.adyen.com/api-explorer/#/balanceplatform/v2/overview) | The Configuration API enables you to create a platform where you can onboard your users as account holders and create balance accounts, cards, and business accounts. | balanceplatform package subclasses | **v2** |
18+
| [Configuration API](https://docs.adyen.com/api-explorer/balanceplatform/2/overview) | The Configuration API enables you to create a platform where you can onboard your users as account holders and create balance accounts, cards, and business accounts. | balanceplatform package subclasses | **v2** |
1719
| [DataProtection API](https://docs.adyen.com/development-resources/data-protection-api) | Adyen Data Protection API provides a way for you to process [Subject Erasure Requests](https://gdpr-info.eu/art-17-gdpr/) as mandated in GDPR. Use our API to submit a request to delete shopper's data, including payment details and other related information (for example, delivery address or shopper email) | DataProtection | **v1** |
1820
| [Legal Entity Management API](https://docs.adyen.com/api-explorer/legalentity/3/overview) | Manage legal entities that contain information required for verification. | legalentitymanagement package subclasses | **v3** |
1921
| [Local/Cloud-based Terminal API](https://docs.adyen.com/point-of-sale/terminal-api-reference) | Our point-of-sale integration. | TerminalLocalAPI or TerminalCloudAPI | - |
20-
| [Management API](https://docs.adyen.com/api-explorer/#/ManagementService/v1/overview) | Configure and manage your Adyen company and merchant accounts, stores, and payment terminals. | management package subclasses | **v1** |
21-
| [Payments API](https://docs.adyen.com/api-explorer/#/Payment/v68/overview) | Our classic integration for online payments. | Payment | **v68** |
22-
| [Payouts API](https://docs.adyen.com/api-explorer/#/Payout/v68/overview) | Endpoints for sending funds to your customers. | Payout | **v68** |
23-
| [Account API](https://docs.adyen.com/api-explorer/#/Account/v6/overview) | This API is used for the classic integration. If you are just starting your implementation, refer to our [new integration guide](https://docs.adyen.com/marketplaces-and-platforms) instead. | Account | **v6** |
24-
| [Fund API](https://docs.adyen.com/api-explorer/#/Fund/v6/overview) | This API is used for the classic integration. If you are just starting your implementation, refer to our [new integration guide](https://docs.adyen.com/marketplaces-and-platforms) instead. | Fund | **v6** |
25-
| [Hosted onboarding API](https://docs.adyen.com/api-explorer/#/Hop/v6/overview) | This API is used for the classic integration. If you are just starting your implementation, refer to our [new integration guide](https://docs.adyen.com/marketplaces-and-platforms) instead. | Hop | **v6** |
26-
| [Notification Configuration API](https://docs.adyen.com/api-explorer/#/NotificationConfigurationService/v6/overview) | This API is used for the classic integration. If you are just starting your implementation, refer to our [new integration guide](https://docs.adyen.com/marketplaces-and-platforms) instead. | Notification | **v6** |
27-
| [Platforms Notifications Webhooks](https://docs.adyen.com/api-explorer/#/NotificationService/v6/overview) | | *Models only* | **v6** |
28-
| [POS Terminal Management API](https://docs.adyen.com/api-explorer/#/postfmapi/v1/overview) | Endpoints for managing your point-of-sale payment terminals. | TerminalManagement | **v1** |
29-
| [Recurring API](https://docs.adyen.com/api-explorer/#/Recurring/v68/overview) | Endpoints for managing saved payment details. | Recurring | **v68** |
22+
| [Management API](https://docs.adyen.com/api-explorer/Management/1/overview) | Configure and manage your Adyen company and merchant accounts, stores, and payment terminals. | management package subclasses | **v1** |
23+
| [Payments API](https://docs.adyen.com/api-explorer/Payment/68/overview) | Our classic integration for online payments. | Payment | **v68** |
24+
| [Payouts API](https://docs.adyen.com/api-explorer/Payout/68/overview) | Endpoints for sending funds to your customers. | Payout | **v68** |
25+
| [POS Terminal Management API](https://docs.adyen.com/api-explorer/postfmapi/1/overview) | Endpoints for managing your point-of-sale payment terminals. | TerminalManagement | **v1** |
26+
| [Recurring API](https://docs.adyen.com/api-explorer/Recurring/68/overview) | Endpoints for managing saved payment details. | Recurring | **v68** |
3027
| [Stored Value API](https://docs.adyen.com/payment-methods/gift-cards/stored-value-api) | Manage both online and point-of-sale gift cards and other stored-value cards. | StoredValue | **v46** |
3128
| [Transfers API](https://docs.adyen.com/api-explorer/transfers/3/overview) | The Transfers API provides endpoints that can be used to get information about all your transactions, move funds within your balance platform or send funds from your balance platform to a transfer instrument. | Transfers | **v3** |
3229
| [Webhooks](https://docs.adyen.com/api-explorer/Webhooks/1/overview) | Adyen uses webhooks to send notifications about payment status updates, newly available reports, and other events that can be subscribed to. For more information, refer to our [documentation](https://docs.adyen.com/development-resources/webhooks). | *Models only* | **v1** |
@@ -59,7 +56,7 @@ You can use Maven and add this dependency to your project's POM:
5956
<dependency>
6057
<groupId>com.adyen</groupId>
6158
<artifactId>adyen-java-api-library</artifactId>
62-
<version>20.1.2</version>
59+
<version>21.0.0</version>
6360
</dependency>
6461
```
6562

0 commit comments

Comments
 (0)