Skip to content

Commit

Permalink
Merge branch 'release-1.3.12.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
age-77 committed May 16, 2023
2 parents 0e2e68f + 7de3db1 commit b3bce1c
Show file tree
Hide file tree
Showing 225 changed files with 241 additions and 229 deletions.
8 changes: 4 additions & 4 deletions pom.xml
@@ -1,10 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>de.adorsys.multibanking</groupId>
<artifactId>xs2a-client-adapter</artifactId>
<version>1.3.12</version>
<version>1.3.12.3</version>
<packaging>jar</packaging>

<name>xs2a-client-adapter</name>
Expand All @@ -28,7 +27,7 @@
<url>scm:git:git@github.com:adorsys/xs2a-adapter.git</url>
<connection>scm:git:git@github.com:adorsys/xs2a-adapter.git</connection>
<developerConnection>scm:git:git@github.com:adorsys/xs2a-adapter.git</developerConnection>
<tag>HEAD</tag>
<tag>xs2a-client-adapter-1.3.12.2</tag>
</scm>

<properties>
Expand Down Expand Up @@ -223,6 +222,7 @@
<!-- <modelPackage>de.adorsys.psd2.client.model</modelPackage>-->
<!-- <apiPackage>de.adorsys.psd2.client.api</apiPackage>-->
<!-- <dateLibrary>java8</dateLibrary>-->
<!-- <hideGenerationTimestamp>true</hideGenerationTimestamp>-->
<!-- </configOptions>-->
<!-- </configuration>-->
<!-- </execution>-->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/ApiException.java
Expand Up @@ -15,7 +15,7 @@
import java.util.Map;
import java.util.List;

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")public class ApiException extends Exception {
public class ApiException extends Exception {
private int code = 0;
private Map<String, List<String>> responseHeaders = null;
private String responseBody = null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/Configuration.java
Expand Up @@ -12,7 +12,7 @@

package de.adorsys.psd2.client;

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")public class Configuration {
public class Configuration {
private static ApiClient defaultApiClient = new ApiClient();

/**
Expand Down
16 changes: 14 additions & 2 deletions src/main/java/de/adorsys/psd2/client/JSON.java
Expand Up @@ -47,8 +47,20 @@ public class JSON {
private LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();

public static GsonBuilder createGson() {
GsonFireBuilder fireBuilder = new GsonFireBuilder();

GsonFireBuilder fireBuilder = new GsonFireBuilder()
.registerTypeSelector(AuthenticationObject.class, new TypeSelector<AuthenticationObject>() {
@Override
public Class<? extends AuthenticationObject> getClassForElement(JsonElement readElement) {
Map<String, Class<? extends AuthenticationObject>> classByDiscriminatorValue = new HashMap<>();

classByDiscriminatorValue.put("chosenScaMethod".toUpperCase(), ChosenScaMethod.class);
classByDiscriminatorValue.put("AuthenticationObject".toUpperCase(), AuthenticationObject.class);
return getClassByDiscriminator(
classByDiscriminatorValue,
getDiscriminatorValue(readElement, ""));
}
})
;
return fireBuilder.createGsonBuilder();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/Pair.java
Expand Up @@ -12,7 +12,7 @@

package de.adorsys.psd2.client;

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")public class Pair {
public class Pair {
private String name = "";
private String value = "";

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/StringUtil.java
Expand Up @@ -12,7 +12,7 @@

package de.adorsys.psd2.client;

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")public class StringUtil {
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/auth/ApiKeyAuth.java
Expand Up @@ -17,7 +17,7 @@
import java.util.Map;
import java.util.List;

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")public class ApiKeyAuth implements Authentication {
public class ApiKeyAuth implements Authentication {
private final String location;
private final String paramName;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/auth/OAuth.java
Expand Up @@ -17,7 +17,7 @@
import java.util.Map;
import java.util.List;

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")public class OAuth implements Authentication {
public class OAuth implements Authentication {
private String accessToken;

public String getAccessToken() {
Expand Down
Expand Up @@ -29,7 +29,7 @@
* Requested access services for a consent.
*/
@Schema(description = "Requested access services for a consent. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AccountAccess {
@SerializedName("accounts")
private List<AccountReference> accounts = null;
Expand Down
Expand Up @@ -31,7 +31,7 @@
* The ASPSP shall give at least one of the account reference identifiers: - iban - bban - pan - maskedPan - msisdn If the account is a multicurrency account currency code in \&quot;currency\&quot; is set to \&quot;XXX\&quot;.
*/
@Schema(description = "The ASPSP shall give at least one of the account reference identifiers: - iban - bban - pan - maskedPan - msisdn If the account is a multicurrency account currency code in \"currency\" is set to \"XXX\". ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AccountDetails {
@SerializedName("resourceId")
private String resourceId = null;
Expand Down
Expand Up @@ -28,7 +28,7 @@
* List of accounts with details.
*/
@Schema(description = "List of accounts with details. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AccountList {
@SerializedName("accounts")
private List<AccountDetails> accounts = new ArrayList<>();
Expand Down
Expand Up @@ -25,7 +25,7 @@
* Identifies a Person that acts as an account owner
*/
@Schema(description = "Identifies a Person that acts as an account owner ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AccountOwner {
@SerializedName("name")
private String name = null;
Expand Down
Expand Up @@ -26,7 +26,7 @@
* Reference to an account by either * IBAN, of a payment accounts, or * BBAN, for payment accounts if there is no IBAN, or * the Primary Account Number (PAN) of a card, can be tokenised by the ASPSP due to PCI DSS requirements, or * the Primary Account Number (PAN) of a card in a masked form, or * an alias to access a payment account via a registered mobile phone number (MSISDN), or * a proprietary ID of the respective account that uniquely identifies the account for this ASPSP.
*/
@Schema(description = "Reference to an account by either * IBAN, of a payment accounts, or * BBAN, for payment accounts if there is no IBAN, or * the Primary Account Number (PAN) of a card, can be tokenised by the ASPSP due to PCI DSS requirements, or * the Primary Account Number (PAN) of a card in a masked form, or * an alias to access a payment account via a registered mobile phone number (MSISDN), or * a proprietary ID of the respective account that uniquely identifies the account for this ASPSP. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AccountReference {
@SerializedName("iban")
private String iban = null;
Expand Down
Expand Up @@ -27,7 +27,7 @@
* JSON based account report. This account report contains transactions resulting from the query parameters. &#x27;booked&#x27; shall be contained if bookingStatus parameter is set to \&quot;booked\&quot; or \&quot;both\&quot;. &#x27;pending&#x27; is not contained if the bookingStatus parameter is set to \&quot;booked\&quot; or \&quot;information\&quot;. &#x27;information&#x27; is used if and only if the bookingStatus entry equals \&quot;information\&quot;. Every active standing order related to the dedicated payment account result into one entry.
*/
@Schema(description = "JSON based account report. This account report contains transactions resulting from the query parameters. 'booked' shall be contained if bookingStatus parameter is set to \"booked\" or \"both\". 'pending' is not contained if the bookingStatus parameter is set to \"booked\" or \"information\". 'information' is used if and only if the bookingStatus entry equals \"information\". Every active standing order related to the dedicated payment account result into one entry. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AccountReport {
@SerializedName("booked")
private TransactionList booked = null;
Expand Down
Expand Up @@ -28,7 +28,7 @@
* Optional if supported by API provider. Is asking for additional information as added within this structured object. The usage of this data element requires at least one of the entries \&quot;accounts\&quot;, \&quot;transactions\&quot; or \&quot;balances\&quot; also to be contained in the object. If detailed accounts are referenced, it is required in addition that any account addressed within the additionalInformation attribute is also addressed by at least one of the attributes \&quot;accounts\&quot;, \&quot;transactions\&quot; or \&quot;balances\&quot;.
*/
@Schema(description = "Optional if supported by API provider. Is asking for additional information as added within this structured object. The usage of this data element requires at least one of the entries \"accounts\", \"transactions\" or \"balances\" also to be contained in the object. If detailed accounts are referenced, it is required in addition that any account addressed within the additionalInformation attribute is also addressed by at least one of the attributes \"accounts\", \"transactions\" or \"balances\". ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AdditionalInformationAccess {
@SerializedName("ownerName")
private List<AccountReference> ownerName = null;
Expand Down
Expand Up @@ -26,7 +26,7 @@
* Is used if and only if the bookingStatus entry equals \&quot;information\&quot;. Every active standing order related to the dedicated payment account result into one entry.
*/
@Schema(description = "Is used if and only if the bookingStatus entry equals \"information\". Every active standing order related to the dedicated payment account result into one entry. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AdditionalInformationStructured {
@SerializedName("standingOrderDetails")
private StandingOrderDetails standingOrderDetails = null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/model/Address.java
Expand Up @@ -25,7 +25,7 @@
* Address
*/

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class Address {
@SerializedName("streetName")
private String streetName = null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/model/Amount.java
Expand Up @@ -25,7 +25,7 @@
* Amount
*/

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class Amount {
@SerializedName("currency")
private String currency = null;
Expand Down
Expand Up @@ -25,7 +25,7 @@
* Authentication object.
*/
@Schema(description = "Authentication object. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AuthenticationObject {
@SerializedName("authenticationType")
private String authenticationType = null;
Expand Down
Expand Up @@ -25,7 +25,7 @@
* Content of the body of an authorisation confirmation request
*/
@Schema(description = "Content of the body of an authorisation confirmation request ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AuthorisationConfirmation {
@SerializedName("confirmationCode")
private String confirmationCode = null;
Expand Down
Expand Up @@ -27,7 +27,7 @@
* Body of the JSON response for an authorisation confirmation request.
*/
@Schema(description = "Body of the JSON response for an authorisation confirmation request.")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AuthorisationConfirmationResponse {
@SerializedName("scaStatus")
private ScaStatusAuthorisationConfirmation scaStatus = null;
Expand Down
Expand Up @@ -26,7 +26,7 @@
* An array of all authorisationIds.
*/
@Schema(description = "An array of all authorisationIds.")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class Authorisations {
@SerializedName("authorisationIds")
private AuthorisationsList authorisationIds = null;
Expand Down
Expand Up @@ -21,7 +21,7 @@
* An array of all authorisationIds.
*/
@Schema(description = "An array of all authorisationIds.")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class AuthorisationsList extends ArrayList<String> {

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/adorsys/psd2/client/model/Balance.java
Expand Up @@ -29,7 +29,7 @@
* A single balance element.
*/
@Schema(description = "A single balance element. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class Balance {
@SerializedName("balanceAmount")
private Amount balanceAmount = null;
Expand Down
Expand Up @@ -22,7 +22,7 @@
* A list of balances regarding this account, e.g. the current balance, the last booked balance. The list might be restricted to the current balance.
*/
@Schema(description = "A list of balances regarding this account, e.g. the current balance, the last booked balance. The list might be restricted to the current balance. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class BalanceList extends ArrayList<Balance> {

@Override
Expand Down
Expand Up @@ -31,7 +31,7 @@
* Generic Body for a bulk payment initiation via JSON. paymentInformationId is contained in code but commented since it is n.a. and not all ASPSP are able to support this field now. In a later version the field will be mandatory.
*/
@Schema(description = "Generic Body for a bulk payment initiation via JSON. paymentInformationId is contained in code but commented since it is n.a. and not all ASPSP are able to support this field now. In a later version the field will be mandatory. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class BulkPaymentInitiationJson {
@SerializedName("batchBookingPreferred")
private Boolean batchBookingPreferred = null;
Expand Down
Expand Up @@ -33,7 +33,7 @@
* Generic JSON response body consistion of the corresponding bulk payment initiation JSON body together with an optional transaction status field.
*/
@Schema(description = "Generic JSON response body consistion of the corresponding bulk payment initiation JSON body together with an optional transaction status field. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class BulkPaymentInitiationWithStatusResponse {
@SerializedName("batchBookingPreferred")
private Boolean batchBookingPreferred = null;
Expand Down
Expand Up @@ -29,7 +29,7 @@
* Card account details.
*/
@Schema(description = "Card account details. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class CardAccountDetails {
@SerializedName("resourceId")
private String resourceId = null;
Expand Down
Expand Up @@ -28,7 +28,7 @@
* List of card accounts with details.
*/
@Schema(description = "List of card accounts with details. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class CardAccountList {
@SerializedName("cardAccounts")
private List<CardAccountDetails> cardAccounts = new ArrayList<>();
Expand Down
Expand Up @@ -27,7 +27,7 @@
* JSON based card account report. This card account report contains transactions resulting from the query parameters.
*/
@Schema(description = "JSON based card account report. This card account report contains transactions resulting from the query parameters. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class CardAccountReport {
@SerializedName("booked")
private CardTransactionList booked = null;
Expand Down
Expand Up @@ -29,7 +29,7 @@
* Body of the JSON response for a successful read card account transaction list request. This card account report contains transactions resulting from the query parameters.
*/
@Schema(description = "Body of the JSON response for a successful read card account transaction list request. This card account report contains transactions resulting from the query parameters. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class CardAccountsTransactionsResponse200 {
@SerializedName("cardAccount")
private AccountReference cardAccount = null;
Expand Down
Expand Up @@ -31,7 +31,7 @@
* Card transaction information.
*/
@Schema(description = "Card transaction information.")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class CardTransaction {
@SerializedName("cardTransactionId")
private String cardTransactionId = null;
Expand Down
Expand Up @@ -22,7 +22,7 @@
* Array of transaction details.
*/
@Schema(description = "Array of transaction details.")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class CardTransactionList extends ArrayList<CardTransaction> {

@Override
Expand Down
Expand Up @@ -27,7 +27,7 @@
* It is contained in addition to the data element &#x27;chosenScaMethod&#x27; if challenge data is needed for SCA. In rare cases this attribute is also used in the context of the &#x27;startAuthorisationWithPsuAuthentication&#x27; link.
*/
@Schema(description = "It is contained in addition to the data element 'chosenScaMethod' if challenge data is needed for SCA. In rare cases this attribute is also used in the context of the 'startAuthorisationWithPsuAuthentication' link. ")
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class ChallengeData {
@SerializedName("image")
private byte[] image = null;
Expand Down
Expand Up @@ -19,7 +19,7 @@
* ChosenScaMethod
*/

@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2023-05-15T10:07:19.009+02:00[Europe/Berlin]")

public class ChosenScaMethod extends AuthenticationObject {

@Override
Expand Down

0 comments on commit b3bce1c

Please sign in to comment.