Skip to content

Commit

Permalink
Merge pull request #1146 from Adyen/automation/release
Browse files Browse the repository at this point in the history
Release v21.6.0
  • Loading branch information
AdyenAutomationBot authored Oct 16, 2023
2 parents b9e6d39 + d6cc1d7 commit c99ba89
Show file tree
Hide file tree
Showing 118 changed files with 30,771 additions and 38 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ openapi-generator-cli:=java -jar $(openapi-generator-jar)

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

Expand Down Expand Up @@ -41,14 +41,17 @@ marketpayconfiguration: spec=NotificationConfigurationService-v6
marketpayconfiguration: smallServiceName=ClassicPlatformConfigurationApi
marketpayhop: spec=HopService-v6
marketpayhop: smallServiceName=ClassicPlatformHopApi
#marketpaywebhooks: spec=MarketPayNotificationService-v6
marketpaywebhooks: spec=MarketPayNotificationService-v6
# Balance Webhooks
acswebhooks: spec=BalancePlatformAcsNotification-v1
configurationwebhooks: spec=BalancePlatformConfigurationNotification-v1
reportwebhooks: spec=BalancePlatformReportNotification-v1
transferwebhooks: spec=BalancePlatformTransferNotification-v3
# Management Webhooks
managementwebhooks: spec=ManagementNotificationService-v1
# Disputes
disputes: spec=DisputeService-v30
disputes: smallServiceName=DisputesApi

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

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

services: $(bigServices) $(singleFileServices)

Expand Down
59 changes: 33 additions & 26 deletions README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.adyen</groupId>
<artifactId>adyen-java-api-library</artifactId>
<packaging>jar</packaging>
<version>21.5.0</version>
<version>21.6.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>
Expand Down Expand Up @@ -184,7 +184,7 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.2</version>
<version>2.15.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -218,7 +218,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -230,7 +230,7 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.16</version>
<version>2.2.17</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/adyen/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class Client {
private ClientInterface httpClient;
private Config config;
public static final String LIB_NAME = "adyen-java-api-library";
public static final String LIB_VERSION = "21.5.0";
public static final String LIB_VERSION = "21.6.0";
public static final String TERMINAL_API_ENDPOINT_TEST = "https://terminal-api-test.adyen.com";
public static final String TERMINAL_API_ENDPOINT_LIVE = "https://terminal-api-live.adyen.com";

Expand Down
148 changes: 148 additions & 0 deletions src/main/java/com/adyen/model/disputes/AbstractOpenApiSchema.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
/*
* Disputes API
* 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 ```
*
* The version of the OpenAPI document: 30
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/


package com.adyen.model.disputes;

import java.util.Objects;
import java.lang.reflect.Type;
import java.util.Map;
import jakarta.ws.rs.core.GenericType;

import com.fasterxml.jackson.annotation.JsonValue;

/**
* Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
*/

public abstract class AbstractOpenApiSchema {

// store the actual instance of the schema/object
private Object instance;

// is nullable
private Boolean isNullable;

// schema type (e.g. oneOf, anyOf)
private final String schemaType;

public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
this.schemaType = schemaType;
this.isNullable = isNullable;
}

/**
* Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();

/**
* Get the actual instance
*
* @return an instance of the actual schema/object
*/
@JsonValue
public Object getActualInstance() {return instance;}

/**
* Set the actual instance
*
* @param instance the actual instance of the schema/object
*/
public void setActualInstance(Object instance) {this.instance = instance;}

/**
* Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
*
* @return an instance of the actual schema/object
*/
public Object getActualInstanceRecursively() {
return getActualInstanceRecursively(this);
}

private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
if (object.getActualInstance() == null) {
return null;
} else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
} else {
return object.getActualInstance();
}
}

/**
* Get the schema type (e.g. anyOf, oneOf)
*
* @return the schema type
*/
public String getSchemaType() {
return schemaType;
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ").append(getClass()).append(" {\n");
sb.append(" instance: ").append(toIndentedString(instance)).append("\n");
sb.append(" isNullable: ").append(toIndentedString(isNullable)).append("\n");
sb.append(" schemaType: ").append(toIndentedString(schemaType)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}

public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
AbstractOpenApiSchema a = (AbstractOpenApiSchema) o;
return Objects.equals(this.instance, a.instance) &&
Objects.equals(this.isNullable, a.isNullable) &&
Objects.equals(this.schemaType, a.schemaType);
}

@Override
public int hashCode() {
return Objects.hash(instance, isNullable, schemaType);
}

/**
* Is nullable
*
* @return true if it's nullable
*/
public Boolean isNullable() {
if (Boolean.TRUE.equals(isNullable)) {
return Boolean.TRUE;
} else {
return Boolean.FALSE;
}
}



}
160 changes: 160 additions & 0 deletions src/main/java/com/adyen/model/disputes/AcceptDisputeRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
/*
* Disputes API
* 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 ```
*
* The version of the OpenAPI document: 30
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/


package com.adyen.model.disputes;

import java.util.Objects;
import java.util.Arrays;
import java.util.Map;
import java.util.HashMap;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.core.JsonProcessingException;


/**
* AcceptDisputeRequest
*/
@JsonPropertyOrder({
AcceptDisputeRequest.JSON_PROPERTY_DISPUTE_PSP_REFERENCE,
AcceptDisputeRequest.JSON_PROPERTY_MERCHANT_ACCOUNT_CODE
})

public class AcceptDisputeRequest {
public static final String JSON_PROPERTY_DISPUTE_PSP_REFERENCE = "disputePspReference";
private String disputePspReference;

public static final String JSON_PROPERTY_MERCHANT_ACCOUNT_CODE = "merchantAccountCode";
private String merchantAccountCode;

public AcceptDisputeRequest() {
}

public AcceptDisputeRequest disputePspReference(String disputePspReference) {
this.disputePspReference = disputePspReference;
return this;
}

/**
* The PSP reference assigned to the dispute.
* @return disputePspReference
**/
@ApiModelProperty(required = true, value = "The PSP reference assigned to the dispute.")
@JsonProperty(JSON_PROPERTY_DISPUTE_PSP_REFERENCE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

public String getDisputePspReference() {
return disputePspReference;
}


@JsonProperty(JSON_PROPERTY_DISPUTE_PSP_REFERENCE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setDisputePspReference(String disputePspReference) {
this.disputePspReference = disputePspReference;
}


public AcceptDisputeRequest merchantAccountCode(String merchantAccountCode) {
this.merchantAccountCode = merchantAccountCode;
return this;
}

/**
* The merchant account identifier, for which you want to process the dispute transaction.
* @return merchantAccountCode
**/
@ApiModelProperty(required = true, value = "The merchant account identifier, for which you want to process the dispute transaction.")
@JsonProperty(JSON_PROPERTY_MERCHANT_ACCOUNT_CODE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

public String getMerchantAccountCode() {
return merchantAccountCode;
}


@JsonProperty(JSON_PROPERTY_MERCHANT_ACCOUNT_CODE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setMerchantAccountCode(String merchantAccountCode) {
this.merchantAccountCode = merchantAccountCode;
}


/**
* Return true if this AcceptDisputeRequest object is equal to o.
*/
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
AcceptDisputeRequest acceptDisputeRequest = (AcceptDisputeRequest) o;
return Objects.equals(this.disputePspReference, acceptDisputeRequest.disputePspReference) &&
Objects.equals(this.merchantAccountCode, acceptDisputeRequest.merchantAccountCode);
}

@Override
public int hashCode() {
return Objects.hash(disputePspReference, merchantAccountCode);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class AcceptDisputeRequest {\n");
sb.append(" disputePspReference: ").append(toIndentedString(disputePspReference)).append("\n");
sb.append(" merchantAccountCode: ").append(toIndentedString(merchantAccountCode)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}

/**
* Create an instance of AcceptDisputeRequest given an JSON string
*
* @param jsonString JSON string
* @return An instance of AcceptDisputeRequest
* @throws JsonProcessingException if the JSON string is invalid with respect to AcceptDisputeRequest
*/
public static AcceptDisputeRequest fromJson(String jsonString) throws JsonProcessingException {
return JSON.getMapper().readValue(jsonString, AcceptDisputeRequest.class);
}
/**
* Convert an instance of AcceptDisputeRequest to an JSON string
*
* @return JSON string
*/
public String toJson() throws JsonProcessingException {
return JSON.getMapper().writeValueAsString(this);
}
}

Loading

0 comments on commit c99ba89

Please sign in to comment.