Merge branch 'release-0.1.18-alpha-release-candidate'

adorsys · Dec 30, 2021 · e4cabb7 · e4cabb7
2 parents adc2808 + 7d54b97
commit e4cabb7
Show file tree

Hide file tree

Showing 136 changed files with 40,660 additions and 428 deletions.
diff --git a/adapters/adorsys-adapter/pom.xml b/adapters/adorsys-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/adapters/adorsys-adapter/src/main/java/de/adorsys/xs2a/adapter/adorsys/AdorsysMapper.java b/adapters/adorsys-adapter/src/main/java/de/adorsys/xs2a/adapter/adorsys/AdorsysMapper.java
@@ -3,16 +3,14 @@
 import de.adorsys.xs2a.adapter.adorsys.model.AdorsysOK200TransactionDetails;
 import de.adorsys.xs2a.adapter.adorsys.model.AdorsysTransactionsResponse200Json;
 import de.adorsys.xs2a.adapter.api.model.OK200TransactionDetails;
-import de.adorsys.xs2a.adapter.api.model.RemittanceInformationStructured;
 import de.adorsys.xs2a.adapter.api.model.TransactionsResponse200Json;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
 @Mapper
 public interface AdorsysMapper {
     TransactionsResponse200Json toTransactionsResponse200Json(AdorsysTransactionsResponse200Json value);
-    OK200TransactionDetails toOK200TransactionDetails(AdorsysOK200TransactionDetails value);
 
-    @Mapping(target = "reference", source = "value")
-    RemittanceInformationStructured toRemittanceInformationStructured(String value);
+    @Mapping(target = "transactionsDetails", source = "transactionsDetails.transactionDetails")
+    OK200TransactionDetails toOK200TransactionDetails(AdorsysOK200TransactionDetails value);
 }
diff --git a/...r/src/test/java/de/adorsys/xs2a/adapter/adorsys/AdorsysAccountInformationServiceTest.java b/...r/src/test/java/de/adorsys/xs2a/adapter/adorsys/AdorsysAccountInformationServiceTest.java
@@ -253,7 +253,6 @@ void getTransactionList() {
                     .get(0)
                     .getRemittanceInformationStructuredArray()
                     .get(0)
-                    .getReference()
                     .equals(REMITTANCE_INFORMATION_STRUCTURED));
     }
 
@@ -292,10 +291,8 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getRemittanceInformationStructuredArray()
                     .get(0)
-                    .getReference()
                     .equals(REMITTANCE_INFORMATION_STRUCTURED));
     }
 }
diff --git a/adapters/adorsys-adapter/src/test/resources/ais/send-otp/response-body.json b/adapters/adorsys-adapter/src/test/resources/ais/send-otp/response-body.json
@@ -1,7 +1,7 @@
 {
   "_links": {
     "scaStatus": {
-      "href": "https://demo-dynamicsandbox-xs2a.cloud.adorsys.de/v1/consents/LWigcCDnqIju2WxmN2QJiIIwDPJRCi55C92NUPa5IXRNg8JYEtRvNJAdwuefV7G4XcX1qLGcJAusajIQOAZagMz9MpaJIQIH3NJX8IHgetw=_=_psGLvQpt9Q/authorisations/19636dbe-99db-4d0f-90de-2573057bc7e4"
+      "href": "https://dev-modelbank-xs2a-connector.cloud.adorsys.de/v1/consents/ct0s-Y8Z44WtefkjG9bpPNncZTwHLG4c-80qRfxCEg_YECQyw8BRU0756d7Om2P9NPb-djhLCY-tXnSUu5KpO8z9MpaJIQIH3NJX8IHgetw=_=_psGLvQpt9Q/authorisations/513f9273-dc29-4a2d-976f-714b185d1c35"
     }
   },
   "scaStatus": "finalised"

diff --git a/adapters/adorsys-adapter/src/test/resources/pis/get-sca-status-response-body.json b/adapters/adorsys-adapter/src/test/resources/pis/get-sca-status-response-body.json
@@ -1,4 +1,5 @@
 {
   "scaStatus": "finalised",
+  "psuMessage": "Mocked PSU message from SPI.",
   "trustedBeneficiaryFlag": false
 }
diff --git a/...est/resources/pis/payments/sepa-credit-transfers/authorise-transaction-response-body.json b/...est/resources/pis/payments/sepa-credit-transfers/authorise-transaction-response-body.json
@@ -1,3 +1,8 @@
 {
+  "_links": {
+    "scaStatus": {
+      "href": "https://dev-modelbank-xs2a-connector.cloud.adorsys.de/v1/payments/sepa-credit-transfers/eesrCxpL3GBU1STQYLfK6yM8afAk9F5hrVutnylIDsFMv1ws-VIYQjo1EIaGDvp6cgftJbETkzvNvu5mZQqWcA==_=_psGLvQpt9Q/authorisations/62de6fa2-b93f-47bd-821f-6b0887d37066"
+    }
+  },
   "scaStatus": "finalised"
 }
diff --git a/adapters/comdirect-adapter/pom.xml b/adapters/comdirect-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/...src/main/java/de/adorsys/xs2a/adapter/comdirect/mapper/OK200TransactionDetailsMapper.java b/...src/main/java/de/adorsys/xs2a/adapter/comdirect/mapper/OK200TransactionDetailsMapper.java
@@ -5,6 +5,6 @@
 import org.mapstruct.Mapper;
 
 @Mapper
-public interface OK200TransactionDetailsMapper extends RemittanceInformationStructuredMapper, TransactionDetailsBodyMapper {
+public interface OK200TransactionDetailsMapper extends RemittanceInformationStructuredMapper {
     OK200TransactionDetails toOK200TransactionDetails(ComdirectOK200TransactionDetails value);
 }
diff --git a/.../src/main/java/de/adorsys/xs2a/adapter/comdirect/mapper/TransactionDetailsBodyMapper.java b/.../src/main/java/de/adorsys/xs2a/adapter/comdirect/mapper/TransactionDetailsBodyMapper.java
diff --git a/...c/test/java/de/adorsys/xs2a/adapter/comdirect/ComdirectAccountInformationServiceTest.java b/...c/test/java/de/adorsys/xs2a/adapter/comdirect/ComdirectAccountInformationServiceTest.java
@@ -152,7 +152,6 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getRemittanceInformationStructured()
                     .equals(REMITTANCE_INFORMATION_STRUCTURED));
     }

diff --git a/adapters/commerzbank-adapter/pom.xml b/adapters/commerzbank-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/...c/main/java/de/adorsys/xs2a/adapter/commerzbank/mapper/OK200TransactionDetailsMapper.java b/...c/main/java/de/adorsys/xs2a/adapter/commerzbank/mapper/OK200TransactionDetailsMapper.java
@@ -5,6 +5,6 @@
 import org.mapstruct.Mapper;
 
 @Mapper
-public interface OK200TransactionDetailsMapper extends TransactionDetailsBodyMapper {
+public interface OK200TransactionDetailsMapper {
     OK200TransactionDetails toOK200TransactionDetails(CommerzbankOK200TransactionDetails value);
 }
diff --git a/...rc/main/java/de/adorsys/xs2a/adapter/commerzbank/mapper/TransactionDetailsBodyMapper.java b/...rc/main/java/de/adorsys/xs2a/adapter/commerzbank/mapper/TransactionDetailsBodyMapper.java
diff --git a/...st/java/de/adorsys/xs2a/adapter/commerzbank/CommerzbankAccountInformationServiceTest.java b/...st/java/de/adorsys/xs2a/adapter/commerzbank/CommerzbankAccountInformationServiceTest.java
@@ -148,7 +148,6 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getRemittanceInformationStructured()
                     .equals(REMITTANCE_INFORMATION_STRUCTURED));
     }

diff --git a/adapters/consors-bank-adapter/pom.xml b/adapters/consors-bank-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/...ers/consors-bank-adapter/src/main/java/de/adorsys/xs2a/adapter/consors/ConsorsMapper.java b/...ers/consors-bank-adapter/src/main/java/de/adorsys/xs2a/adapter/consors/ConsorsMapper.java
@@ -1,16 +1,11 @@
 package de.adorsys.xs2a.adapter.consors;
 
 import de.adorsys.xs2a.adapter.api.model.OK200TransactionDetails;
-import de.adorsys.xs2a.adapter.api.model.TransactionDetailsBody;
-import de.adorsys.xs2a.adapter.api.model.Transactions;
 import de.adorsys.xs2a.adapter.consors.model.ConsorsOK200TransactionDetails;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 @Mapper
 public interface ConsorsMapper {
 
-    @Mapping(target = "transactionDetails", source = "value")
-    TransactionDetailsBody toTransactionDetailsBody(Transactions value);
     OK200TransactionDetails toOK200TransactionDetails(ConsorsOK200TransactionDetails value);
 }
diff --git a/...r/src/test/java/de/adorsys/xs2a/adapter/consors/ConsorsAccountInformationServiceTest.java b/...r/src/test/java/de/adorsys/xs2a/adapter/consors/ConsorsAccountInformationServiceTest.java
@@ -148,7 +148,6 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getTransactionId()
                     .equals("test"));
     }

diff --git a/adapters/crealogix-adapter/pom.xml b/adapters/crealogix-adapter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/...rs/crealogix-adapter/src/main/java/de/adorsys/xs2a/adapter/crealogix/CrealogixMapper.java b/...rs/crealogix-adapter/src/main/java/de/adorsys/xs2a/adapter/crealogix/CrealogixMapper.java
@@ -3,7 +3,6 @@
 import de.adorsys.xs2a.adapter.api.model.*;
 import de.adorsys.xs2a.adapter.crealogix.model.*;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 @Mapper
 public interface CrealogixMapper {
@@ -14,9 +13,6 @@ public interface CrealogixMapper {
     Transactions toTransactions(CrealogixTransactionDetails value);
     TokenResponse toTokenResponse(CrealogixValidationResponse value);
 
-    @Mapping(target = "transactionDetails", expression = "java(toTransactions(value))")
-    TransactionDetailsBody toTransactionDetailsBody(CrealogixTransactionDetails value);
-
     default String map(RemittanceInformationStructured value) {
         return value == null ? null : value.getReference();
     }

diff --git a/...ter/src/main/java/de/adorsys/xs2a/adapter/crealogix/CrealogixRequestResponseHandlers.java b/...ter/src/main/java/de/adorsys/xs2a/adapter/crealogix/CrealogixRequestResponseHandlers.java
@@ -104,7 +104,7 @@ private static HrefType getHrefType() {
     private static TppMessage getTppMessage(String message) {
         TppMessage tppMessage = new TppMessage();
         tppMessage.setCategory(TppMessageCategory.ERROR);
-        tppMessage.setCode(MessageCode.TOKEN_UNKNOWN);
+        tppMessage.setCode(MessageCode.TOKEN_UNKNOWN.toString());
         tppMessage.setText(message);
         return tppMessage;
     }

diff --git a/...c/test/java/de/adorsys/xs2a/adapter/crealogix/CrealogixAccountInformationServiceTest.java b/...c/test/java/de/adorsys/xs2a/adapter/crealogix/CrealogixAccountInformationServiceTest.java
@@ -137,7 +137,6 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getRemittanceInformationStructured()
                     .equals(REMITTANCE_INFORMATION_STRUCTURED));
     }

diff --git a/adapters/dab-bank-adapter/pom.xml b/adapters/dab-bank-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/adapters/dab-bank-adapter/src/main/java/de/adorsys/xs2a/adapter/dab/DabMapper.java b/adapters/dab-bank-adapter/src/main/java/de/adorsys/xs2a/adapter/dab/DabMapper.java
@@ -1,16 +1,11 @@
 package de.adorsys.xs2a.adapter.dab;
 
 import de.adorsys.xs2a.adapter.api.model.OK200TransactionDetails;
-import de.adorsys.xs2a.adapter.api.model.TransactionDetailsBody;
-import de.adorsys.xs2a.adapter.api.model.Transactions;
 import de.adorsys.xs2a.adapter.dab.model.DabOK200TransactionDetails;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 @Mapper
 public interface DabMapper {
 
-    @Mapping(target = "transactionDetails", source = "value")
-    TransactionDetailsBody toTransactionDetailsBody(Transactions value);
     OK200TransactionDetails toOK200TransactionDetails(DabOK200TransactionDetails value);
 }
diff --git a/...k-adapter/src/test/java/de/adorsys/xs2a/adapter/dab/DabAccountInformationServiceTest.java b/...k-adapter/src/test/java/de/adorsys/xs2a/adapter/dab/DabAccountInformationServiceTest.java
@@ -70,7 +70,6 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getTransactionId()
                     .equals("test"));
     }

diff --git a/adapters/deutsche-bank-adapter/pom.xml b/adapters/deutsche-bank-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/...e-bank-adapter/src/main/java/de/adorsys/xs2a/adapter/deutschebank/DeutscheBankMapper.java b/...e-bank-adapter/src/main/java/de/adorsys/xs2a/adapter/deutschebank/DeutscheBankMapper.java
@@ -5,17 +5,13 @@
 import de.adorsys.xs2a.adapter.deutschebank.model.DeutscheBankTransactionDetails;
 import de.adorsys.xs2a.adapter.deutschebank.model.DeutscheBankTransactionResponse200Json;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 @Mapper
 public interface DeutscheBankMapper {
     TransactionsResponse200Json toTransactionsResponse200Json(DeutscheBankTransactionResponse200Json value);
     OK200TransactionDetails toOK200TransactionDetails(DeutscheBankOK200TransactionDetails value);
     Transactions toTransactions(DeutscheBankTransactionDetails value);
 
-    @Mapping(target = "transactionDetails", expression = "java(toTransactions(value))")
-    TransactionDetailsBody toTransactionDetailsBody(DeutscheBankTransactionDetails value);
-
     default String map(RemittanceInformationStructured value) {
         return value == null ? null : value.getReference();
     }

diff --git a/.../java/de/adorsys/xs2a/adapter/deutschebank/DeutscheBankAccountInformationServiceTest.java b/.../java/de/adorsys/xs2a/adapter/deutschebank/DeutscheBankAccountInformationServiceTest.java
@@ -143,7 +143,6 @@ void getTransactionDetails() {
             .asInstanceOf(InstanceOfAssertFactories.type(OK200TransactionDetails.class))
             .matches(body ->
                 body.getTransactionsDetails()
-                    .getTransactionDetails()
                     .getRemittanceInformationStructured()
                     .equals(REMITTANCE_INFORMATION_STRUCTURED));
     }

diff --git a/adapters/deutsche-bank-adapter/src/test/resources/ais/authorise-transaction.json b/adapters/deutsche-bank-adapter/src/test/resources/ais/authorise-transaction.json
@@ -14,6 +14,11 @@
   },
   "response": {
     "body": {
+      "_links": {
+        "scaStatus": {
+          "href": "https://simulator-xs2a.db.com/ais/DE/SB-DB/v1/consents/17501be7-1dcd-4ad5-ab30-6d02b170e31a/authorisations/9cd38df2-1315-41d4-9602-5f63149aacaf"
+        }
+      },
       "scaStatus": "finalised"
     }
   }

diff --git a/...-adapter/src/test/resources/pis/payments/sepa-credit-transfers/authorise-transaction.json b/...-adapter/src/test/resources/pis/payments/sepa-credit-transfers/authorise-transaction.json
@@ -14,6 +14,11 @@
   },
   "response": {
     "body": {
+      "_links": {
+        "scaStatus": {
+          "href": "https://simulator-xs2a.db.com/pis/DE/SB-DB/v1/payments/sepa-credit-transfers/de91a99b-5b9d-4f70-8846-81beba089f87/authorisations/43ede576-4b22-4435-ac54-70f2a5eba912"
+        }
+      },
       "scaStatus": "finalised"
       }
     }

diff --git a/...src/test/resources/pis/periodic-payments/sepa-credit-transfers/authorise-transaction.json b/...src/test/resources/pis/periodic-payments/sepa-credit-transfers/authorise-transaction.json
@@ -14,6 +14,11 @@
   },
   "response": {
     "body": {
+      "_links": {
+        "scaStatus": {
+          "href": "https://simulator-xs2a.db.com/pis/DE/SB-DB/v1/periodic-payments/sepa-credit-transfers/9f3ad160-f096-4738-baed-7b42f5a5aeb5/authorisations/89383666-16a8-4cf7-8803-290f9a56628c"
+        }
+      },
       "scaStatus": "finalised"
       }
     }

diff --git a/adapters/fiducia-adapter/pom.xml b/adapters/fiducia-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.xs2a.adapter</groupId>
         <artifactId>xs2a-adapter</artifactId>
-        <version>0.1.17</version>
+        <version>0.1.18-alpha-release-candidate</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/...apter/src/main/java/de/adorsys/xs2a/adapter/fiducia/FiduciaAccountInformationService.java b/...apter/src/main/java/de/adorsys/xs2a/adapter/fiducia/FiduciaAccountInformationService.java
@@ -33,12 +33,11 @@
 import org.mapstruct.factory.Mappers;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 public class FiduciaAccountInformationService extends BaseAccountInformationService {
-    private static final Set<String> SUPPORTED_BOOKING_STATUSES = new HashSet<>(Collections.singletonList("booked"));
+    private static final Set<String> SUPPORTED_BOOKING_STATUSES = Set.of("booked", "information");
     private static final String BOOKING_STATUS_ERROR_MESSAGE = String.format(
         "ASPSP supports only the following booking statuses: %s. " +
             "The booking status from the request has to be changed to the supported ones.",

diff --git a/...s/fiducia-adapter/src/main/java/de/adorsys/xs2a/adapter/fiducia/mapper/FiduciaMapper.java b/...s/fiducia-adapter/src/main/java/de/adorsys/xs2a/adapter/fiducia/mapper/FiduciaMapper.java
@@ -39,8 +39,9 @@ PeriodicPaymentInitiationMultipartBody toPeriodicPaymentInitiationMultipartBody(
     @Mapping(target = "currencyExchange", ignore = true)
     Transactions toTransactionDetails(FiduciaTransactionDetails value);
 
-    @Mapping(target = "transactionDetails", expression = "java(toTransactionDetails(value))")
-    TransactionDetailsBody toTransactionDetailsBody(FiduciaTransactionDetails value);
+    default String map(RemittanceInformationStructured value) {
+        return value == null ? null : value.getReference();
+    }
 
     PaymentInitationRequestResponse201 toPaymentInitationRequestResponse201(FiduciaPaymentInitationRequestResponse201 value);
 }