Skip to content

Commit c99ba89

Browse files
Merge pull request #1146 from Adyen/automation/release
Release v21.6.0
2 parents b9e6d39 + d6cc1d7 commit c99ba89

File tree

118 files changed

+30771
-38
lines changed

Some content is hidden

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

118 files changed

+30771
-38
lines changed

Diff for: Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ openapi-generator-cli:=java -jar $(openapi-generator-jar)
55

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

@@ -41,14 +41,17 @@ marketpayconfiguration: spec=NotificationConfigurationService-v6
4141
marketpayconfiguration: smallServiceName=ClassicPlatformConfigurationApi
4242
marketpayhop: spec=HopService-v6
4343
marketpayhop: smallServiceName=ClassicPlatformHopApi
44-
#marketpaywebhooks: spec=MarketPayNotificationService-v6
44+
marketpaywebhooks: spec=MarketPayNotificationService-v6
4545
# Balance Webhooks
4646
acswebhooks: spec=BalancePlatformAcsNotification-v1
4747
configurationwebhooks: spec=BalancePlatformConfigurationNotification-v1
4848
reportwebhooks: spec=BalancePlatformReportNotification-v1
4949
transferwebhooks: spec=BalancePlatformTransferNotification-v3
5050
# Management Webhooks
5151
managementwebhooks: spec=ManagementNotificationService-v1
52+
# Disputes
53+
disputes: spec=DisputeService-v30
54+
disputes: smallServiceName=DisputesApi
5255

5356
$(modelGen): target/spec $(openapi-generator-jar)
5457
rm -rf $(models)/$@ $(output)
@@ -73,7 +76,7 @@ $(modelGen): target/spec $(openapi-generator-jar)
7376

7477
# Full service + models automation
7578
bigServices:=balanceplatform checkout payout management legalentitymanagement transfers
76-
singleFileServices:=balancecontrol binlookup dataprotection storedvalue posterminalmanagement recurring payment
79+
singleFileServices:=balancecontrol binlookup dataprotection storedvalue posterminalmanagement recurring payment disputes
7780

7881
services: $(bigServices) $(singleFileServices)
7982

Diff for: README.md

+33-26
Large diffs are not rendered by default.

Diff for: pom.xml

+4-4
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>21.5.0</version>
7+
<version>21.6.0</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>
@@ -184,7 +184,7 @@
184184
<dependency>
185185
<groupId>com.fasterxml.jackson.datatype</groupId>
186186
<artifactId>jackson-datatype-jsr310</artifactId>
187-
<version>2.15.2</version>
187+
<version>2.15.3</version>
188188
</dependency>
189189
<dependency>
190190
<groupId>com.fasterxml.jackson.core</groupId>
@@ -218,7 +218,7 @@
218218
<dependency>
219219
<groupId>org.mockito</groupId>
220220
<artifactId>mockito-core</artifactId>
221-
<version>5.5.0</version>
221+
<version>5.6.0</version>
222222
<scope>test</scope>
223223
</dependency>
224224
<dependency>
@@ -230,7 +230,7 @@
230230
<dependency>
231231
<groupId>io.swagger.core.v3</groupId>
232232
<artifactId>swagger-annotations</artifactId>
233-
<version>2.2.16</version>
233+
<version>2.2.17</version>
234234
<scope>compile</scope>
235235
</dependency>
236236
<dependency>

Diff for: src/main/java/com/adyen/Client.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Client {
1111
private ClientInterface httpClient;
1212
private Config config;
1313
public static final String LIB_NAME = "adyen-java-api-library";
14-
public static final String LIB_VERSION = "21.5.0";
14+
public static final String LIB_VERSION = "21.6.0";
1515
public static final String TERMINAL_API_ENDPOINT_TEST = "https://terminal-api-test.adyen.com";
1616
public static final String TERMINAL_API_ENDPOINT_LIVE = "https://terminal-api-live.adyen.com";
1717

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
/*
2+
* Disputes API
3+
* You can use the [Disputes API](https://docs.adyen.com/risk-management/disputes-api) to automate the dispute handling process so that you can respond to disputes and chargebacks as soon as they are initiated. The Disputes API lets you retrieve defense reasons, supply and delete defense documents, and accept or defend disputes. ## Authentication Each request to the Disputes API must be signed with an API key. For this, obtain an API Key from your Customer Area, as described in [How to get the API key](https://docs.adyen.com/development-resources/api-credentials#generate-api-key). Then set this key to the `X-API-Key` header value, for example: ``` curl -H \"Content-Type: application/json\" \\ -H \"X-API-Key: Your_API_key\" \\ ... ``` Note that when going live, you need to generate new web service user credentials to access the [live endpoints](https://docs.adyen.com/development-resources/live-endpoints). ## Versioning Disputes 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://ca-test.adyen.com/ca/services/DisputeService/v30/defendDispute ```
4+
*
5+
* The version of the OpenAPI document: 30
6+
*
7+
*
8+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
9+
* https://openapi-generator.tech
10+
* Do not edit the class manually.
11+
*/
12+
13+
14+
package com.adyen.model.disputes;
15+
16+
import java.util.Objects;
17+
import java.lang.reflect.Type;
18+
import java.util.Map;
19+
import jakarta.ws.rs.core.GenericType;
20+
21+
import com.fasterxml.jackson.annotation.JsonValue;
22+
23+
/**
24+
* Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
25+
*/
26+
27+
public abstract class AbstractOpenApiSchema {
28+
29+
// store the actual instance of the schema/object
30+
private Object instance;
31+
32+
// is nullable
33+
private Boolean isNullable;
34+
35+
// schema type (e.g. oneOf, anyOf)
36+
private final String schemaType;
37+
38+
public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
39+
this.schemaType = schemaType;
40+
this.isNullable = isNullable;
41+
}
42+
43+
/**
44+
* Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
45+
*
46+
* @return an instance of the actual schema/object
47+
*/
48+
public abstract Map<String, GenericType> getSchemas();
49+
50+
/**
51+
* Get the actual instance
52+
*
53+
* @return an instance of the actual schema/object
54+
*/
55+
@JsonValue
56+
public Object getActualInstance() {return instance;}
57+
58+
/**
59+
* Set the actual instance
60+
*
61+
* @param instance the actual instance of the schema/object
62+
*/
63+
public void setActualInstance(Object instance) {this.instance = instance;}
64+
65+
/**
66+
* Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
67+
*
68+
* @return an instance of the actual schema/object
69+
*/
70+
public Object getActualInstanceRecursively() {
71+
return getActualInstanceRecursively(this);
72+
}
73+
74+
private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
75+
if (object.getActualInstance() == null) {
76+
return null;
77+
} else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
78+
return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
79+
} else {
80+
return object.getActualInstance();
81+
}
82+
}
83+
84+
/**
85+
* Get the schema type (e.g. anyOf, oneOf)
86+
*
87+
* @return the schema type
88+
*/
89+
public String getSchemaType() {
90+
return schemaType;
91+
}
92+
93+
@Override
94+
public String toString() {
95+
StringBuilder sb = new StringBuilder();
96+
sb.append("class ").append(getClass()).append(" {\n");
97+
sb.append(" instance: ").append(toIndentedString(instance)).append("\n");
98+
sb.append(" isNullable: ").append(toIndentedString(isNullable)).append("\n");
99+
sb.append(" schemaType: ").append(toIndentedString(schemaType)).append("\n");
100+
sb.append("}");
101+
return sb.toString();
102+
}
103+
104+
/**
105+
* Convert the given object to string with each line indented by 4 spaces
106+
* (except the first line).
107+
*/
108+
private String toIndentedString(Object o) {
109+
if (o == null) {
110+
return "null";
111+
}
112+
return o.toString().replace("\n", "\n ");
113+
}
114+
115+
public boolean equals(Object o) {
116+
if (this == o) {
117+
return true;
118+
}
119+
if (o == null || getClass() != o.getClass()) {
120+
return false;
121+
}
122+
AbstractOpenApiSchema a = (AbstractOpenApiSchema) o;
123+
return Objects.equals(this.instance, a.instance) &&
124+
Objects.equals(this.isNullable, a.isNullable) &&
125+
Objects.equals(this.schemaType, a.schemaType);
126+
}
127+
128+
@Override
129+
public int hashCode() {
130+
return Objects.hash(instance, isNullable, schemaType);
131+
}
132+
133+
/**
134+
* Is nullable
135+
*
136+
* @return true if it's nullable
137+
*/
138+
public Boolean isNullable() {
139+
if (Boolean.TRUE.equals(isNullable)) {
140+
return Boolean.TRUE;
141+
} else {
142+
return Boolean.FALSE;
143+
}
144+
}
145+
146+
147+
148+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
/*
2+
* Disputes API
3+
* You can use the [Disputes API](https://docs.adyen.com/risk-management/disputes-api) to automate the dispute handling process so that you can respond to disputes and chargebacks as soon as they are initiated. The Disputes API lets you retrieve defense reasons, supply and delete defense documents, and accept or defend disputes. ## Authentication Each request to the Disputes API must be signed with an API key. For this, obtain an API Key from your Customer Area, as described in [How to get the API key](https://docs.adyen.com/development-resources/api-credentials#generate-api-key). Then set this key to the `X-API-Key` header value, for example: ``` curl -H \"Content-Type: application/json\" \\ -H \"X-API-Key: Your_API_key\" \\ ... ``` Note that when going live, you need to generate new web service user credentials to access the [live endpoints](https://docs.adyen.com/development-resources/live-endpoints). ## Versioning Disputes 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://ca-test.adyen.com/ca/services/DisputeService/v30/defendDispute ```
4+
*
5+
* The version of the OpenAPI document: 30
6+
*
7+
*
8+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
9+
* https://openapi-generator.tech
10+
* Do not edit the class manually.
11+
*/
12+
13+
14+
package com.adyen.model.disputes;
15+
16+
import java.util.Objects;
17+
import java.util.Arrays;
18+
import java.util.Map;
19+
import java.util.HashMap;
20+
import com.fasterxml.jackson.annotation.JsonInclude;
21+
import com.fasterxml.jackson.annotation.JsonProperty;
22+
import com.fasterxml.jackson.annotation.JsonCreator;
23+
import com.fasterxml.jackson.annotation.JsonTypeName;
24+
import com.fasterxml.jackson.annotation.JsonValue;
25+
import io.swagger.annotations.ApiModel;
26+
import io.swagger.annotations.ApiModelProperty;
27+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
28+
import com.fasterxml.jackson.core.JsonProcessingException;
29+
30+
31+
/**
32+
* AcceptDisputeRequest
33+
*/
34+
@JsonPropertyOrder({
35+
AcceptDisputeRequest.JSON_PROPERTY_DISPUTE_PSP_REFERENCE,
36+
AcceptDisputeRequest.JSON_PROPERTY_MERCHANT_ACCOUNT_CODE
37+
})
38+
39+
public class AcceptDisputeRequest {
40+
public static final String JSON_PROPERTY_DISPUTE_PSP_REFERENCE = "disputePspReference";
41+
private String disputePspReference;
42+
43+
public static final String JSON_PROPERTY_MERCHANT_ACCOUNT_CODE = "merchantAccountCode";
44+
private String merchantAccountCode;
45+
46+
public AcceptDisputeRequest() {
47+
}
48+
49+
public AcceptDisputeRequest disputePspReference(String disputePspReference) {
50+
this.disputePspReference = disputePspReference;
51+
return this;
52+
}
53+
54+
/**
55+
* The PSP reference assigned to the dispute.
56+
* @return disputePspReference
57+
**/
58+
@ApiModelProperty(required = true, value = "The PSP reference assigned to the dispute.")
59+
@JsonProperty(JSON_PROPERTY_DISPUTE_PSP_REFERENCE)
60+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
61+
62+
public String getDisputePspReference() {
63+
return disputePspReference;
64+
}
65+
66+
67+
@JsonProperty(JSON_PROPERTY_DISPUTE_PSP_REFERENCE)
68+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
69+
public void setDisputePspReference(String disputePspReference) {
70+
this.disputePspReference = disputePspReference;
71+
}
72+
73+
74+
public AcceptDisputeRequest merchantAccountCode(String merchantAccountCode) {
75+
this.merchantAccountCode = merchantAccountCode;
76+
return this;
77+
}
78+
79+
/**
80+
* The merchant account identifier, for which you want to process the dispute transaction.
81+
* @return merchantAccountCode
82+
**/
83+
@ApiModelProperty(required = true, value = "The merchant account identifier, for which you want to process the dispute transaction.")
84+
@JsonProperty(JSON_PROPERTY_MERCHANT_ACCOUNT_CODE)
85+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
86+
87+
public String getMerchantAccountCode() {
88+
return merchantAccountCode;
89+
}
90+
91+
92+
@JsonProperty(JSON_PROPERTY_MERCHANT_ACCOUNT_CODE)
93+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
94+
public void setMerchantAccountCode(String merchantAccountCode) {
95+
this.merchantAccountCode = merchantAccountCode;
96+
}
97+
98+
99+
/**
100+
* Return true if this AcceptDisputeRequest object is equal to o.
101+
*/
102+
@Override
103+
public boolean equals(Object o) {
104+
if (this == o) {
105+
return true;
106+
}
107+
if (o == null || getClass() != o.getClass()) {
108+
return false;
109+
}
110+
AcceptDisputeRequest acceptDisputeRequest = (AcceptDisputeRequest) o;
111+
return Objects.equals(this.disputePspReference, acceptDisputeRequest.disputePspReference) &&
112+
Objects.equals(this.merchantAccountCode, acceptDisputeRequest.merchantAccountCode);
113+
}
114+
115+
@Override
116+
public int hashCode() {
117+
return Objects.hash(disputePspReference, merchantAccountCode);
118+
}
119+
120+
@Override
121+
public String toString() {
122+
StringBuilder sb = new StringBuilder();
123+
sb.append("class AcceptDisputeRequest {\n");
124+
sb.append(" disputePspReference: ").append(toIndentedString(disputePspReference)).append("\n");
125+
sb.append(" merchantAccountCode: ").append(toIndentedString(merchantAccountCode)).append("\n");
126+
sb.append("}");
127+
return sb.toString();
128+
}
129+
130+
/**
131+
* Convert the given object to string with each line indented by 4 spaces
132+
* (except the first line).
133+
*/
134+
private String toIndentedString(Object o) {
135+
if (o == null) {
136+
return "null";
137+
}
138+
return o.toString().replace("\n", "\n ");
139+
}
140+
141+
/**
142+
* Create an instance of AcceptDisputeRequest given an JSON string
143+
*
144+
* @param jsonString JSON string
145+
* @return An instance of AcceptDisputeRequest
146+
* @throws JsonProcessingException if the JSON string is invalid with respect to AcceptDisputeRequest
147+
*/
148+
public static AcceptDisputeRequest fromJson(String jsonString) throws JsonProcessingException {
149+
return JSON.getMapper().readValue(jsonString, AcceptDisputeRequest.class);
150+
}
151+
/**
152+
* Convert an instance of AcceptDisputeRequest to an JSON string
153+
*
154+
* @return JSON string
155+
*/
156+
public String toJson() throws JsonProcessingException {
157+
return JSON.getMapper().writeValueAsString(this);
158+
}
159+
}
160+

0 commit comments

Comments
 (0)