-
Notifications
You must be signed in to change notification settings - Fork 133
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1044 from Adyen/develop
Release 20.1.0
- Loading branch information
Showing
864 changed files
with
46,802 additions
and
4,920 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
| <groupId>com.adyen</groupId> | ||
| <artifactId>adyen-java-api-library</artifactId> | ||
| <packaging>jar</packaging> | ||
| <version>20.0.0</version> | ||
| <version>20.1.0</version> | ||
| <name>Adyen Java API Library</name> | ||
| <description>Adyen API Client Library for Java</description> | ||
| <url>https://github.com/adyen/adyen-java-api-library</url> | ||
|
|
@@ -25,7 +25,7 @@ | |
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
| <swagger-core-version>1.6.10</swagger-core-version> | ||
| <swagger-core-version>1.6.11</swagger-core-version> | ||
| </properties> | ||
| <scm> | ||
| <connection>scm:git:[email protected]:Adyen/adyen-java-api-library.git</connection> | ||
|
|
@@ -88,7 +88,7 @@ | |
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <version>3.2.1</version> | ||
| <version>3.3.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
|
|
@@ -142,7 +142,7 @@ | |
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-checkstyle-plugin</artifactId> | ||
| <version>3.2.2</version> | ||
| <version>3.3.0</version> | ||
| <configuration> | ||
| <configLocation>checkstyle.xml</configLocation> | ||
| <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> | ||
|
|
@@ -162,7 +162,7 @@ | |
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <version>5.1.8</version> | ||
| <version>5.1.9</version> | ||
| <executions> | ||
| <execution> | ||
| <id>bundle-manifest</id> | ||
|
|
@@ -220,7 +220,7 @@ | |
| <dependency> | ||
| <groupId>io.swagger.core.v3</groupId> | ||
| <artifactId>swagger-annotations</artifactId> | ||
| <version>2.2.9</version> | ||
| <version>2.2.11</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * The Balance Control API lets you transfer funds between merchant accounts that belong to the same legal entity and are under the same company account. ## Authentication To connect to the Balance Control API, you must authenticate your requests with an [API key or basic auth username and password](https://docs.adyen.com/development-resources/api-authentication). To learn how you can generate these, see [API credentials](https://docs.adyen.com/development-resources/api-credentials).Here is an example of authenticating a request with an API key: ``` curl -H \"X-API-Key: Your_API_key\" \\ -H \"Content-Type: application/json\" \\ ... ``` Note that when going live, you need to generate API credentials to access the [live endpoints](https://docs.adyen.com/development-resources/live-endpoints). ## Versioning The Balance Control API supports [versioning](https://docs.adyen.com/development-resources/versioning) using a version suffix in the endpoint URL. This suffix has the following format: \"vXX\", where XX is the version number. For example: ``` https://pal-test.adyen.com/pal/servlet/BalanceControl/v1/balanceTransfer ``` | ||
| * | ||
| * The version of the OpenAPI document: 1 | ||
| * Contact: [email protected] | ||
| * | ||
| * | ||
| * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). | ||
| * https://openapi-generator.tech | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * The Balance Control API lets you transfer funds between merchant accounts that belong to the same legal entity and are under the same company account. ## Authentication To connect to the Balance Control API, you must authenticate your requests with an [API key or basic auth username and password](https://docs.adyen.com/development-resources/api-authentication). To learn how you can generate these, see [API credentials](https://docs.adyen.com/development-resources/api-credentials).Here is an example of authenticating a request with an API key: ``` curl -H \"X-API-Key: Your_API_key\" \\ -H \"Content-Type: application/json\" \\ ... ``` Note that when going live, you need to generate API credentials to access the [live endpoints](https://docs.adyen.com/development-resources/live-endpoints). ## Versioning The Balance Control API supports [versioning](https://docs.adyen.com/development-resources/versioning) using a version suffix in the endpoint URL. This suffix has the following format: \"vXX\", where XX is the version number. For example: ``` https://pal-test.adyen.com/pal/servlet/BalanceControl/v1/balanceTransfer ``` | ||
| * | ||
| * The version of the OpenAPI document: 1 | ||
| * Contact: [email protected] | ||
| * | ||
| * | ||
| * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). | ||
| * https://openapi-generator.tech | ||
|
|
@@ -41,6 +41,8 @@ | |
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
| import java.util.Set; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import com.adyen.model.balancecontrol.JSON; | ||
|
|
||
|
|
@@ -159,6 +161,10 @@ private String toIndentedString(Object o) { | |
| openapiRequiredFields.add("currency"); | ||
| openapiRequiredFields.add("value"); | ||
| } | ||
| /** | ||
| * logger for Deserialization Errors | ||
| */ | ||
| private static final Logger log = Logger.getLogger(Amount.class.getName()); | ||
|
|
||
| /** | ||
| * Validates the JSON Object and throws an exception if issues found | ||
|
|
@@ -179,7 +185,7 @@ public static void validateJsonObject(JsonObject jsonObj) throws IOException { | |
| // check to see if the JSON string contains additional fields | ||
| for (Entry<String, JsonElement> entry : entries) { | ||
| if (!Amount.openapiFields.contains(entry.getKey())) { | ||
| throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Amount` properties. JSON: %s", entry.getKey(), jsonObj.toString())); | ||
| log.log(Level.WARNING, String.format("The field `%s` in the JSON string is not defined in the `Amount` properties.", entry.getKey())); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -191,7 +197,7 @@ public static void validateJsonObject(JsonObject jsonObj) throws IOException { | |
| } | ||
| // validate the optional field currency | ||
| if (jsonObj.get("currency") != null && !jsonObj.get("currency").isJsonPrimitive()) { | ||
| throw new IllegalArgumentException(String.format("Expected the field `currency` to be a primitive type in the JSON string but got `%s`", jsonObj.get("currency").toString())); | ||
| log.log(Level.WARNING, String.format("Expected the field `currency` to be a primitive type in the JSON string but got `%s`", jsonObj.get("currency").toString())); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * The Balance Control API lets you transfer funds between merchant accounts that belong to the same legal entity and are under the same company account. ## Authentication To connect to the Balance Control API, you must authenticate your requests with an [API key or basic auth username and password](https://docs.adyen.com/development-resources/api-authentication). To learn how you can generate these, see [API credentials](https://docs.adyen.com/development-resources/api-credentials).Here is an example of authenticating a request with an API key: ``` curl -H \"X-API-Key: Your_API_key\" \\ -H \"Content-Type: application/json\" \\ ... ``` Note that when going live, you need to generate API credentials to access the [live endpoints](https://docs.adyen.com/development-resources/live-endpoints). ## Versioning The Balance Control API supports [versioning](https://docs.adyen.com/development-resources/versioning) using a version suffix in the endpoint URL. This suffix has the following format: \"vXX\", where XX is the version number. For example: ``` https://pal-test.adyen.com/pal/servlet/BalanceControl/v1/balanceTransfer ``` | ||
| * | ||
| * The version of the OpenAPI document: 1 | ||
| * Contact: [email protected] | ||
| * | ||
| * | ||
| * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). | ||
| * https://openapi-generator.tech | ||
|
|
@@ -42,6 +42,8 @@ | |
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
| import java.util.Set; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import com.adyen.model.balancecontrol.JSON; | ||
|
|
||
|
|
@@ -333,6 +335,10 @@ private String toIndentedString(Object o) { | |
| openapiRequiredFields.add("toMerchant"); | ||
| openapiRequiredFields.add("type"); | ||
| } | ||
| /** | ||
| * logger for Deserialization Errors | ||
| */ | ||
| private static final Logger log = Logger.getLogger(BalanceTransferRequest.class.getName()); | ||
|
|
||
| /** | ||
| * Validates the JSON Object and throws an exception if issues found | ||
|
|
@@ -353,7 +359,7 @@ public static void validateJsonObject(JsonObject jsonObj) throws IOException { | |
| // check to see if the JSON string contains additional fields | ||
| for (Entry<String, JsonElement> entry : entries) { | ||
| if (!BalanceTransferRequest.openapiFields.contains(entry.getKey())) { | ||
| throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `BalanceTransferRequest` properties. JSON: %s", entry.getKey(), jsonObj.toString())); | ||
| log.log(Level.WARNING, String.format("The field `%s` in the JSON string is not defined in the `BalanceTransferRequest` properties.", entry.getKey())); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -369,19 +375,19 @@ public static void validateJsonObject(JsonObject jsonObj) throws IOException { | |
| } | ||
| // validate the optional field description | ||
| if (jsonObj.get("description") != null && !jsonObj.get("description").isJsonPrimitive()) { | ||
| throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); | ||
| log.log(Level.WARNING, String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); | ||
| } | ||
| // validate the optional field fromMerchant | ||
| if (jsonObj.get("fromMerchant") != null && !jsonObj.get("fromMerchant").isJsonPrimitive()) { | ||
| throw new IllegalArgumentException(String.format("Expected the field `fromMerchant` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fromMerchant").toString())); | ||
| log.log(Level.WARNING, String.format("Expected the field `fromMerchant` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fromMerchant").toString())); | ||
| } | ||
| // validate the optional field reference | ||
| if (jsonObj.get("reference") != null && !jsonObj.get("reference").isJsonPrimitive()) { | ||
| throw new IllegalArgumentException(String.format("Expected the field `reference` to be a primitive type in the JSON string but got `%s`", jsonObj.get("reference").toString())); | ||
| log.log(Level.WARNING, String.format("Expected the field `reference` to be a primitive type in the JSON string but got `%s`", jsonObj.get("reference").toString())); | ||
| } | ||
| // validate the optional field toMerchant | ||
| if (jsonObj.get("toMerchant") != null && !jsonObj.get("toMerchant").isJsonPrimitive()) { | ||
| throw new IllegalArgumentException(String.format("Expected the field `toMerchant` to be a primitive type in the JSON string but got `%s`", jsonObj.get("toMerchant").toString())); | ||
| log.log(Level.WARNING, String.format("Expected the field `toMerchant` to be a primitive type in the JSON string but got `%s`", jsonObj.get("toMerchant").toString())); | ||
| } | ||
| // ensure the field type can be parsed to an enum value | ||
| if (jsonObj.get("type") != null) { | ||
|
|
||
Oops, something went wrong.