Skip to content

Commit

Permalink
Merge pull request #1098 from Adyen/develop
Browse files Browse the repository at this point in the history 
Release v21.0.0
  • Loading branch information
@jillingk
jillingk authored Jul 28, 2023
2 parents 773c8e3 + c491d60 commit b647fae
Show file tree
Hide file tree
Showing 1,313 changed files with 78,093 additions and 194,160 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @Adyen/api-libraries-reviewers
* @Adyen/integration-tools-testing
10 changes: 6 additions & 4 deletions .github/workflows/javaci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
java: [ '11', '17', '20' ]
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK ${{ matrix.Java }}
uses: actions/setup-java@v3

with:
java-version: '11'
java-version: ${{ matrix.java }}
distribution: 'adopt'

- name: Run the tests with Maven
run: mvn -B test --no-transfer-progress
run: mvn -B clean test package --no-transfer-progress
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
rm -f ./.github/scripts/release.js
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666 # v5.0.1
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
with:
token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/services.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Java Library Services + Models

on: [ workflow_dispatch ]

jobs:
generate:
runs-on: ubuntu-latest
name: Generate Models + Services
steps:
- uses: actions/checkout@v3
- run: make services
- name: Set PR variables
id: vars
run: |
cd target/spec
echo ::set-output name=pr_title::"Update models + services"
echo ::set-output name=pr_body::"OpenAPI spec or templates produced new models + services on $(date +%d-%m-%Y) \
by [commit](https://github.com/Adyen/adyen-openapi/commit/$(git rev-parse HEAD))."
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
author: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
base: develop
branch: automation/services
title: ${{ steps.vars.outputs.pr_title }}
body: ${{ steps.vars.outputs.pr_body }}
add-paths: |
src/main/java/com/adyen/model
src/main/java/com/adyen/service
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.iml
/target/**
.DS_Store
.vscode
19 changes: 7 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ openapi-generator-jar:=target/openapi-generator-cli.jar
openapi-generator-cli:=java -jar $(openapi-generator-jar)

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

Expand All @@ -19,8 +19,6 @@ binlookup: smallServiceName=BinLookupApi
checkout: spec=CheckoutService-v70
dataprotection: spec=DataProtectionService-v1
dataprotection: smallServiceName=DataProtectionApi
capital: spec=GrantService-v3
capital: smallServiceName=CapitalApi
storedvalue: spec=StoredValueService-v46
storedvalue: smallServiceName=StoredValueApi
posterminalmanagement: spec=TfmAPIService-v1
Expand Down Expand Up @@ -59,17 +57,16 @@ $(modelGen): target/spec $(openapi-generator-jar)
--library $(library) \
--global-property modelDocs=false \
--global-property modelTests=false \
--inline-schema-name-mappings PaymentDonationRequest_paymentMethod=CheckoutPaymentMethod \
--inline-schema-name-mappings DonationPaymentRequest_paymentMethod=CheckoutPaymentMethod \
--additional-properties=dateLibrary=java8 \
--additional-properties=serializationLibrary=gson \
--additional-properties=openApiNullable=false \
--additional-properties=resourceClass=$(resourceClass)Resource
mv $(output)/$(models)/$@ $(models)/$@
mv $(output)/$(models)/JSON.java $(models)/$@

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

services: $(bigServices) $(singleFileServices)

Expand All @@ -90,9 +87,8 @@ $(bigServices): target/spec $(openapi-generator-jar)
--api-name-suffix Api \
--global-property modelDocs=false \
--global-property modelTests=false \
--inline-schema-name-mappings PaymentDonationRequest_paymentMethod=CheckoutPaymentMethod \
--inline-schema-name-mappings DonationPaymentRequest_paymentMethod=CheckoutPaymentMethod \
--additional-properties=dateLibrary=java8 \
--additional-properties=serializationLibrary=gson \
--additional-properties=openApiNullable=false
mv $(output)/$(models)/$@ $(models)/$@
mv $(output)/src/main/java/com/adyen/service/JSON.java $(models)/$@
Expand All @@ -106,7 +102,7 @@ $(singleFileServices): target/spec $(openapi-generator-jar)
$(openapi-generator-cli) generate \
-i target/spec/json/$(spec).json \
-g $(generator) \
-c templates/libraries/okhttp-gson/config.yaml \
-c templates/libraries/jersey3/config.yaml \
-o $(output) \
--reserved-words-mappings configuration=configuration \
--ignore-file-override ./.openapi-generator-ignore \
Expand All @@ -118,9 +114,8 @@ $(singleFileServices): target/spec $(openapi-generator-jar)
--api-name-suffix Api \
--global-property modelDocs=false \
--global-property modelTests=false \
--inline-schema-name-mappings PaymentDonationRequest_paymentMethod=CheckoutPaymentMethod \
--inline-schema-name-mappings DonationPaymentRequest_paymentMethod=CheckoutPaymentMethod \
--additional-properties=dateLibrary=java8 \
--additional-properties=serializationLibrary=gson \
--additional-properties=openApiNullable=false \
--additional-properties=smallServiceName=$(smallServiceName)
mv $(output)/$(models)/$@ $(models)/$@
Expand Down
21 changes: 9 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# Adyen Java API Library

[![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/)

This is the officially supported Java library for using Adyen's APIs.

## Supported API versions
Expand All @@ -13,20 +15,15 @@ The Library supports all APIs under the following services:
| [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** |
| [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** |
| [Checkout API](https://docs.adyen.com/api-explorer/Checkout/70/overview) | Our latest integration for accepting online payments. | Checkout | **v70** |
| [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** |
| [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** |
| [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** |
| [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** |
| [Local/Cloud-based Terminal API](https://docs.adyen.com/point-of-sale/terminal-api-reference) | Our point-of-sale integration. | TerminalLocalAPI or TerminalCloudAPI | - |
| [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** |
| [Payments API](https://docs.adyen.com/api-explorer/#/Payment/v68/overview) | Our classic integration for online payments. | Payment | **v68** |
| [Payouts API](https://docs.adyen.com/api-explorer/#/Payout/v68/overview) | Endpoints for sending funds to your customers. | Payout | **v68** |
| [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** |
| [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** |
| [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** |
| [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** |
| [Platforms Notifications Webhooks](https://docs.adyen.com/api-explorer/#/NotificationService/v6/overview) | | *Models only* | **v6** |
| [POS Terminal Management API](https://docs.adyen.com/api-explorer/#/postfmapi/v1/overview) | Endpoints for managing your point-of-sale payment terminals. | TerminalManagement | **v1** |
| [Recurring API](https://docs.adyen.com/api-explorer/#/Recurring/v68/overview) | Endpoints for managing saved payment details. | Recurring | **v68** |
| [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** |
| [Payments API](https://docs.adyen.com/api-explorer/Payment/68/overview) | Our classic integration for online payments. | Payment | **v68** |
| [Payouts API](https://docs.adyen.com/api-explorer/Payout/68/overview) | Endpoints for sending funds to your customers. | Payout | **v68** |
| [POS Terminal Management API](https://docs.adyen.com/api-explorer/postfmapi/1/overview) | Endpoints for managing your point-of-sale payment terminals. | TerminalManagement | **v1** |
| [Recurring API](https://docs.adyen.com/api-explorer/Recurring/68/overview) | Endpoints for managing saved payment details. | Recurring | **v68** |
| [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** |
| [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** |
| [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** |
Expand Down Expand Up @@ -59,7 +56,7 @@ You can use Maven and add this dependency to your project's POM:
<dependency>
<groupId>com.adyen</groupId>
<artifactId>adyen-java-api-library</artifactId>
<version>20.1.2</version>
<version>21.0.0</version>
</dependency>
```

Expand Down
Loading

0 comments on commit b647fae

Please sign in to comment.