diff --git a/CHANGELOG.md b/CHANGELOG.md index eb02ccf1d..cd9967aa9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## [9.13.0] +### Changed +- Update SSDK 20.1.0 and BBOM 2026.03 LTS, boat-maven-plugin unified 0.17.66 + ## [9.12.0] ### Added - Implement Portfolio Risk assessments data ingestion; diff --git a/README.md b/README.md index 60c62ed45..b0160f630 100644 --- a/README.md +++ b/README.md @@ -41,32 +41,33 @@ You can find listed here the API specification containing the opinionated model ## Compatibility Matrix -| Stream [version](https://github.com/Backbase/stream-services/releases) | Banking Services | Java | Spring Boot | -|------------------------------------------------------------------------|-----------------------|------|-------------| -| 8.3.0 to latest | 2025.10 (20.0.0) | 21 | 3.5.6 | +| Stream [version](https://github.com/Backbase/stream-services/releases) | Banking Services | Java | Spring Boot | +|------------------------------------------------------------------------|--------------------------|------|-------------| +| 9.11.0 to latest | 2026.03-LTS (20.1.0) | 21 | 3.5.11 | +| 8.3.0 to latest | 2025.10 (20.0.0) | 21 | 3.5.6 | | 8.2.0 to 8.3.0 | 2025.10-RC (20.0.0-rc.2) | 21 | 3.5.6 | -| 8.1.0 to 8.1.1 | 2025.10-RC (20.0.0-rc.2) | 21 | 3.5.6 | -| 7.8.0 to 8.1.0 | 2025.09-LTS | 21 | 3.4 | -| 7.0.0 to 7.7.0 | 2025.04.3 | 21 | 3.4 | -| 6.18.0 to 6.19.0 | 2025.03-LTS | 21 | 3.3 | -| 6.2.0 to 6.17.0 | 2024.10 | 21 | 3.3 | -| 6.0.0 to 6.1.0 | 2024.10 | 21 | 3.2 | -| 5.10.0 to 5.16.0 | 2024.09-LTS | 21 | 3.2 | -| 5.0.0 to 5.9.x | 2024.04 | 21 | 3.2 | -| 4.1.1 to 4.x.x | 2024.03-LTS | 17 | 3.1 | -| 4.0.0 to 4.1.0 | 2023.12 | 17 | 3.1 | -| 3.70.0 to 3.x.x | 2023.09-LTS | 17 | 2.7 | -| 3.50.0 to 3.69.0 | 2023.06 | 17 | 2.7 | -| 3.34.0 to 3.49.0 | 2023.02-LTS | 17 | 2.7 | -| 3.16.0 to 3.33.0 | 2022.10 | 17 | 2.7 | -| 3.8.0 to 3.15.0 | 2022.09 | 17 | 2.7 | -| 3.1.0 to 3.7.0 | 2022.09 | 11 | 2.6 | -| 2.71.0 to 3.0.0 | 2022.04 | 11 | 2.5 | -| 2.49.0 to 2.69.0 | 2021.09 (2.21.2.x) | 11 | 2.5 | -| 2.44.0 to 2.48.0 | 2021.07 (2.21.0.x) | 11 | 2.5 | -| 2.23.0 to 2.43.0 | 2.20.x | 11 | 2.3 | -| 2.15.0 to 2.22.0 | 2.19.x | 11 | 2.3 | -| 2.1.0 to 2.14.0 | 2.19.x | 8 | 2.3 | +| 8.1.0 to 8.1.1 | 2025.10-RC (20.0.0-rc.2) | 21 | 3.5.6 | +| 7.8.0 to 8.1.0 | 2025.09-LTS | 21 | 3.4 | +| 7.0.0 to 7.7.0 | 2025.04.3 | 21 | 3.4 | +| 6.18.0 to 6.19.0 | 2025.03-LTS | 21 | 3.3 | +| 6.2.0 to 6.17.0 | 2024.10 | 21 | 3.3 | +| 6.0.0 to 6.1.0 | 2024.10 | 21 | 3.2 | +| 5.10.0 to 5.16.0 | 2024.09-LTS | 21 | 3.2 | +| 5.0.0 to 5.9.x | 2024.04 | 21 | 3.2 | +| 4.1.1 to 4.x.x | 2024.03-LTS | 17 | 3.1 | +| 4.0.0 to 4.1.0 | 2023.12 | 17 | 3.1 | +| 3.70.0 to 3.x.x | 2023.09-LTS | 17 | 2.7 | +| 3.50.0 to 3.69.0 | 2023.06 | 17 | 2.7 | +| 3.34.0 to 3.49.0 | 2023.02-LTS | 17 | 2.7 | +| 3.16.0 to 3.33.0 | 2022.10 | 17 | 2.7 | +| 3.8.0 to 3.15.0 | 2022.09 | 17 | 2.7 | +| 3.1.0 to 3.7.0 | 2022.09 | 11 | 2.6 | +| 2.71.0 to 3.0.0 | 2022.04 | 11 | 2.5 | +| 2.49.0 to 2.69.0 | 2021.09 (2.21.2.x) | 11 | 2.5 | +| 2.44.0 to 2.48.0 | 2021.07 (2.21.0.x) | 11 | 2.5 | +| 2.23.0 to 2.43.0 | 2.20.x | 11 | 2.3 | +| 2.15.0 to 2.22.0 | 2.19.x | 11 | 2.3 | +| 2.1.0 to 2.14.0 | 2.19.x | 8 | 2.3 | ## Software License Terms Please see the license terms [here](LICENSE.txt). diff --git a/pom.xml b/pom.xml index cc8fe79c6..5d293a65d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.backbase.buildingblocks backbase-parent - 20.0.0 + 20.1.0 @@ -41,9 +41,9 @@ 21 - 20.0.0 - 2025.10.2 - 0.17.62 + 20.1.0 + 2026.03-LTS + 0.17.66 4.7.0 true spring diff --git a/stream-compositions/api/integrations-api/payment-order-integration-api/src/main/resources/service-api-v2.yaml b/stream-compositions/api/integrations-api/payment-order-integration-api/src/main/resources/service-api-v2.yaml index 59f42d871..51ff095b2 100644 --- a/stream-compositions/api/integrations-api/payment-order-integration-api/src/main/resources/service-api-v2.yaml +++ b/stream-compositions/api/integrations-api/payment-order-integration-api/src/main/resources/service-api-v2.yaml @@ -89,4 +89,4 @@ components: paymentOrder: type: array items: - $ref: '../../../target/yaml/payment/payment-order-service-api-v3.17.0.yaml#/components/schemas/PaymentOrderPostRequest' + $ref: '../../../target/yaml/payment/payment-order-service-api-v3.19.1.yaml#/components/schemas/PaymentOrderPostRequest' diff --git a/stream-compositions/api/integrations-api/transaction-integration-api/src/main/resources/service-api-v2.yaml b/stream-compositions/api/integrations-api/transaction-integration-api/src/main/resources/service-api-v2.yaml index 2c4ef29b4..78d1d0ed4 100644 --- a/stream-compositions/api/integrations-api/transaction-integration-api/src/main/resources/service-api-v2.yaml +++ b/stream-compositions/api/integrations-api/transaction-integration-api/src/main/resources/service-api-v2.yaml @@ -79,7 +79,7 @@ components: transactions: type: array items: - $ref: '../../../target/yaml/transaction-manager/transaction-manager-service-api-v3.0.2.yaml#/components/schemas/TransactionsPostRequestBody' + $ref: '../../../target/yaml/transaction-manager/transaction-manager-service-api-v3.4.0.yaml#/components/schemas/TransactionsPostRequestBody' additions: type: object additionalProperties: diff --git a/stream-compositions/api/service-api/payment-order-composition-api/src/main/resources/service-api-v2.yaml b/stream-compositions/api/service-api/payment-order-composition-api/src/main/resources/service-api-v2.yaml index 5b12c1e8c..359ded8b9 100644 --- a/stream-compositions/api/service-api/payment-order-composition-api/src/main/resources/service-api-v2.yaml +++ b/stream-compositions/api/service-api/payment-order-composition-api/src/main/resources/service-api-v2.yaml @@ -125,7 +125,7 @@ components: paymentOrders: type: array items: - $ref: '../../../target/yaml/payment/payment-order-service-api-v3.17.0.yaml#/components/schemas/PaymentOrderPostRequest' + $ref: '../../../target/yaml/payment/payment-order-service-api-v3.19.1.yaml#/components/schemas/PaymentOrderPostRequest' PaymentOrderIngestionResponse: type: object @@ -133,11 +133,11 @@ components: newPaymentOrder: type: array items: - $ref: '../../../target/yaml/payment/payment-order-service-api-v3.17.0.yaml#/components/schemas/PaymentOrderPostResponse' + $ref: '../../../target/yaml/payment/payment-order-service-api-v3.19.1.yaml#/components/schemas/PaymentOrderPostResponse' updatedPaymentOrder: type: array items: - $ref: '../../../target/yaml/payment/payment-order-service-api-v3.17.0.yaml#/components/schemas/PaymentOrderPostResponse' + $ref: '../../../target/yaml/payment/payment-order-service-api-v3.19.1.yaml#/components/schemas/PaymentOrderPostResponse' deletedPaymentOrder: type: array items: diff --git a/stream-compositions/api/service-api/transaction-composition-api/src/main/resources/service-api-v2.yaml b/stream-compositions/api/service-api/transaction-composition-api/src/main/resources/service-api-v2.yaml index eea4397e4..d955e6f1e 100644 --- a/stream-compositions/api/service-api/transaction-composition-api/src/main/resources/service-api-v2.yaml +++ b/stream-compositions/api/service-api/transaction-composition-api/src/main/resources/service-api-v2.yaml @@ -111,7 +111,7 @@ components: transactions: type: array items: - $ref: '../../../target/yaml/transaction-manager/transaction-manager-service-api-v3.0.2.yaml#/components/schemas/TransactionsPostRequestBody' + $ref: '../../../target/yaml/transaction-manager/transaction-manager-service-api-v3.4.0.yaml#/components/schemas/TransactionsPostRequestBody' TransactionIngestionResponse: type: object @@ -119,7 +119,7 @@ components: transactions: type: array items: - $ref: '../../../target/yaml/transaction-manager/transaction-manager-service-api-v3.0.2.yaml#/components/schemas/TransactionsPostResponseBody' + $ref: '../../../target/yaml/transaction-manager/transaction-manager-service-api-v3.4.0.yaml#/components/schemas/TransactionsPostResponseBody' additions: type: object additionalProperties: diff --git a/stream-compositions/pom.xml b/stream-compositions/pom.xml index 8d1f565f0..2581e3f8a 100644 --- a/stream-compositions/pom.xml +++ b/stream-compositions/pom.xml @@ -27,14 +27,14 @@ - 2025.10.2 - 0.17.62 + 2026.03-LTS + 0.17.66 1.12.5 5.15.0 false **/test/**/* - 2024.0.1 - 20.0.0-rc.2 + 2025.0.0 + 20.1.0 3.0.2 /tmp true diff --git a/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/LegalEntityIntegrationClientConfiguration.java b/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/LegalEntityIntegrationClientConfiguration.java index b5f6a2d0e..80fadbb1d 100644 --- a/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/LegalEntityIntegrationClientConfiguration.java +++ b/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/LegalEntityIntegrationClientConfiguration.java @@ -21,6 +21,7 @@ public LegalEntityIntegrationClientConfiguration() { } @Bean + @Primary public ApiClient legalEntityCompositionClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); @@ -28,8 +29,8 @@ public ApiClient legalEntityCompositionClient(ObjectMapper objectMapper, DateFor @Bean @Primary - public LegalEntityIntegrationApi legalEntityCompositionIntegrationApi(ApiClient legalEntityClient) { - return new LegalEntityIntegrationApi(legalEntityClient); + public LegalEntityIntegrationApi legalEntityCompositionIntegrationApi(ApiClient legalEntityCompositionClient) { + return new LegalEntityIntegrationApi(legalEntityCompositionClient); } } diff --git a/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/ProductCompositionClientConfiguration.java b/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/ProductCompositionClientConfiguration.java index 83107af1f..09368b1c2 100644 --- a/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/ProductCompositionClientConfiguration.java +++ b/stream-compositions/services/legal-entity-composition-service/src/main/java/com/backbase/stream/compositions/legalentity/core/config/ProductCompositionClientConfiguration.java @@ -21,6 +21,7 @@ public ProductCompositionClientConfiguration() { } @Bean + @Primary public ApiClient productClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/payment-order-composition-service/src/main/java/com/backbase/stream/compositions/paymentorders/core/config/PaymentOrderCompositionConfiguration.java b/stream-compositions/services/payment-order-composition-service/src/main/java/com/backbase/stream/compositions/paymentorders/core/config/PaymentOrderCompositionConfiguration.java index 6a6ad7ced..220c70ef5 100644 --- a/stream-compositions/services/payment-order-composition-service/src/main/java/com/backbase/stream/compositions/paymentorders/core/config/PaymentOrderCompositionConfiguration.java +++ b/stream-compositions/services/payment-order-composition-service/src/main/java/com/backbase/stream/compositions/paymentorders/core/config/PaymentOrderCompositionConfiguration.java @@ -34,6 +34,7 @@ public PaymentOrderIntegrationApi paymentOrderIntegrationApi(ApiClient paymentOr } @Bean + @Primary public ApiClient paymentOrderIntegrationClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/product-catalog-composition-service/src/main/java/com/backbase/stream/compositions/productcatalog/core/config/ProductCatalogConfiguration.java b/stream-compositions/services/product-catalog-composition-service/src/main/java/com/backbase/stream/compositions/productcatalog/core/config/ProductCatalogConfiguration.java index 1182bee85..033b43731 100644 --- a/stream-compositions/services/product-catalog-composition-service/src/main/java/com/backbase/stream/compositions/productcatalog/core/config/ProductCatalogConfiguration.java +++ b/stream-compositions/services/product-catalog-composition-service/src/main/java/com/backbase/stream/compositions/productcatalog/core/config/ProductCatalogConfiguration.java @@ -36,6 +36,7 @@ public ProductCatalogIntegrationApi productCatalogIntegrationApi(ApiClient legal } @Bean + @Primary public ApiClient productCatalogClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/PaymentCompositionClientConfiguration.java b/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/PaymentCompositionClientConfiguration.java index 98574ad5a..8c96fa1b2 100644 --- a/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/PaymentCompositionClientConfiguration.java +++ b/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/PaymentCompositionClientConfiguration.java @@ -21,6 +21,7 @@ public PaymentCompositionClientConfiguration() { } @Bean + @Primary public ApiClient paymentOrderApiClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/ProductIntegrationClientConfiguration.java b/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/ProductIntegrationClientConfiguration.java index 015e73390..c32be3c94 100644 --- a/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/ProductIntegrationClientConfiguration.java +++ b/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/ProductIntegrationClientConfiguration.java @@ -22,6 +22,7 @@ public ProductIntegrationClientConfiguration() { } @Bean + @Primary public ApiClient productClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/TransactionCompositionClientConfiguration.java b/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/TransactionCompositionClientConfiguration.java index 2130d5850..73931e93e 100644 --- a/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/TransactionCompositionClientConfiguration.java +++ b/stream-compositions/services/product-composition-service/src/main/java/com/backbase/stream/compositions/product/core/config/TransactionCompositionClientConfiguration.java @@ -21,6 +21,7 @@ public TransactionCompositionClientConfiguration() { } @Bean + @Primary public ApiClient transactionClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionCursorClientConfiguration.java b/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionCursorClientConfiguration.java index f88b41dad..3ae79f6fa 100644 --- a/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionCursorClientConfiguration.java +++ b/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionCursorClientConfiguration.java @@ -21,6 +21,7 @@ public TransactionCursorClientConfiguration() { } @Bean + @Primary public ApiClient transactionCursorClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionIntegrationClientConfiguration.java b/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionIntegrationClientConfiguration.java index c4c896529..28ea179c3 100644 --- a/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionIntegrationClientConfiguration.java +++ b/stream-compositions/services/transaction-composition-service/src/main/java/com/backbase/stream/compositions/transaction/core/config/TransactionIntegrationClientConfiguration.java @@ -21,6 +21,7 @@ public TransactionIntegrationClientConfiguration() { } @Bean + @Primary public ApiClient transactionIntegrationClient(ObjectMapper objectMapper, DateFormat dateFormat) { return new ApiClient(getWebClient(), objectMapper, dateFormat) .setBasePath(createBasePath()); diff --git a/stream-dbs-clients/pom.xml b/stream-dbs-clients/pom.xml index 1e9519032..f6f4a75df 100644 --- a/stream-dbs-clients/pom.xml +++ b/stream-dbs-clients/pom.xml @@ -587,7 +587,7 @@ generate-sources REFACTOR_ALLOF_WITH_PROPERTIES_ONLY=true - ${project.build.directory}/yaml/audit/audit-service-api-v*.yaml + ${project.build.directory}/yaml/audit-spec/audit-service-api-v*.yaml com.backbase.dbs.audit.api.service.v2 com.backbase.dbs.audit.api.service.v2.model diff --git a/stream-payment-order/payment-order-core/src/main/java/com/backbase/stream/paymentorder/PaymentOrderUnitOfWorkExecutor.java b/stream-payment-order/payment-order-core/src/main/java/com/backbase/stream/paymentorder/PaymentOrderUnitOfWorkExecutor.java index e50fc310d..e50fd9ea9 100644 --- a/stream-payment-order/payment-order-core/src/main/java/com/backbase/stream/paymentorder/PaymentOrderUnitOfWorkExecutor.java +++ b/stream-payment-order/payment-order-core/src/main/java/com/backbase/stream/paymentorder/PaymentOrderUnitOfWorkExecutor.java @@ -273,7 +273,7 @@ private Mono retrieveNextPage(int currentCount, final paymentOrderPostFilterRequest.setStatuses(FILTER); return paymentOrdersApi.postFilterPaymentOrders(null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, currentCount / PAGE_SIZE, PAGE_SIZE, null, + null, null, null, null, null, null, null, null, currentCount / PAGE_SIZE, PAGE_SIZE, null, null, paymentOrderPostFilterRequest) .retryWhen(fixedDelay(3, Duration.of(2000, MILLIS)).filter( t -> t instanceof WebClientRequestException diff --git a/stream-payment-order/payment-order-core/src/test/java/com/backbase/stream/task/PaymentOrderUnitOfWorkExecutorTest.java b/stream-payment-order/payment-order-core/src/test/java/com/backbase/stream/task/PaymentOrderUnitOfWorkExecutorTest.java index 40ee00533..ebca72d97 100644 --- a/stream-payment-order/payment-order-core/src/test/java/com/backbase/stream/task/PaymentOrderUnitOfWorkExecutorTest.java +++ b/stream-payment-order/payment-order-core/src/test/java/com/backbase/stream/task/PaymentOrderUnitOfWorkExecutorTest.java @@ -123,7 +123,7 @@ void test_prepareUnitOfWork_paymentOrderPostRequestFlux() { .addPaymentOrdersItem(getPaymentOrderResponse) .totalElements(new BigDecimal(1)); - doReturn(Mono.just(paymentOrderPostFilterResponse)).when(paymentOrdersApi).postFilterPaymentOrders(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()); + doReturn(Mono.just(paymentOrderPostFilterResponse)).when(paymentOrdersApi).postFilterPaymentOrders(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()); ArrangementItem arrangementItem = new ArrangementItem() .id("arrangementId_1") @@ -174,7 +174,7 @@ void test_prepareunitofwork_blankuserid() { .addPaymentOrdersItem(getPaymentOrderResponseWithEmptyUserId) .totalElements(new BigDecimal(1)); - lenient().doReturn(Mono.just(paymentOrderPostFilterResponse)).when(paymentOrdersApi).postFilterPaymentOrders(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()); + lenient().doReturn(Mono.just(paymentOrderPostFilterResponse)).when(paymentOrdersApi).postFilterPaymentOrders(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()); StepVerifier .create(paymentOrderUnitOfWorkExecutor.prepareUnitOfWork(paymentOrderPostRequestFlux)) diff --git a/stream-portfolio/portfolio-core/src/main/java/com/backbase/stream/portfolio/mapper/PortfolioMapper.java b/stream-portfolio/portfolio-core/src/main/java/com/backbase/stream/portfolio/mapper/PortfolioMapper.java index 6e0dd0564..5eff6dc86 100644 --- a/stream-portfolio/portfolio-core/src/main/java/com/backbase/stream/portfolio/mapper/PortfolioMapper.java +++ b/stream-portfolio/portfolio-core/src/main/java/com/backbase/stream/portfolio/mapper/PortfolioMapper.java @@ -3,8 +3,6 @@ import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import org.mapstruct.MappingConstants; -import org.mapstruct.ValueMapping; import com.backbase.portfolio.api.service.integration.v1.model.AggregatePortfoliosPostRequest; import com.backbase.portfolio.api.service.integration.v1.model.AggregatePortfoliosPutRequest; import com.backbase.portfolio.api.service.integration.v1.model.AllocationType; @@ -35,6 +33,8 @@ import com.backbase.stream.portfolio.model.PositionTransaction; import com.backbase.stream.portfolio.model.SubPortfolio; import com.backbase.stream.portfolio.model.TransactionCategory; +import org.mapstruct.MappingConstants; +import org.mapstruct.ValueMapping; @Mapper public interface PortfolioMapper { diff --git a/stream-product/product-core/src/main/java/com/backbase/stream/product/service/ArrangementService.java b/stream-product/product-core/src/main/java/com/backbase/stream/product/service/ArrangementService.java index fff2aceae..88e01cf37 100644 --- a/stream-product/product-core/src/main/java/com/backbase/stream/product/service/ArrangementService.java +++ b/stream-product/product-core/src/main/java/com/backbase/stream/product/service/ArrangementService.java @@ -118,7 +118,7 @@ public Flux upsertBatchArrangements(List arr * @return Product */ public Mono getArrangement(String internalId) { - return arrangementsApi.getArrangementById(internalId, false) + return arrangementsApi.getArrangementById(internalId, false, null) .onErrorResume(WebClientResponseException.NotFound.class, ex -> { log.info("Arrangement: {} not found", internalId); return Mono.empty(); @@ -165,7 +165,7 @@ public Mono getArrangementInternalId(String externalId) { public Mono deleteArrangementByInternalId(String arrangementInternalId) { log.debug("Retrieving Arrangement by internal id {}", arrangementInternalId); // get arrangement externalId by internal id. - return arrangementsApi.getArrangementById(arrangementInternalId, false) + return arrangementsApi.getArrangementById(arrangementInternalId, false, null) .mapNotNull(ArrangementItem::getExternalArrangementId) .onErrorResume(WebClientResponseException.class, e -> { log.warn("Failed to retrieve arrangement by internal id {}, {}", arrangementInternalId, e.getMessage()); diff --git a/stream-product/product-core/src/test/java/com/backbase/stream/product/service/ArrangementServiceTest.java b/stream-product/product-core/src/test/java/com/backbase/stream/product/service/ArrangementServiceTest.java index b647c219b..df4d8b8d7 100644 --- a/stream-product/product-core/src/test/java/com/backbase/stream/product/service/ArrangementServiceTest.java +++ b/stream-product/product-core/src/test/java/com/backbase/stream/product/service/ArrangementServiceTest.java @@ -265,7 +265,7 @@ void getArrangement() { String internalId = "internal_id"; ArrangementItem arrangementItem = new ArrangementItem().id("acct_arr_item_id"); - when(arrangementsApi.getArrangementById(internalId, false)).thenReturn(Mono.just(arrangementItem)); + when(arrangementsApi.getArrangementById(internalId, false, null)).thenReturn(Mono.just(arrangementItem)); StepVerifier.create(arrangementService.getArrangement(internalId)) .assertNext(response -> { @@ -273,7 +273,7 @@ void getArrangement() { Assertions.assertEquals(response.getId(), arrangementItem.getId()); }).verifyComplete(); - verify(arrangementsApi).getArrangementById(internalId, false); + verify(arrangementsApi).getArrangementById(internalId, false, null); } @Test @@ -282,11 +282,11 @@ void getArrangement_NotFound() { WebClientResponseException webClientResponseException = buildWebClientResponseException(HttpStatus.NOT_FOUND, "Arrangement Not Found"); - when(arrangementsApi.getArrangementById(internalId, false)).thenReturn(Mono.error(webClientResponseException)); + when(arrangementsApi.getArrangementById(internalId, false, null)).thenReturn(Mono.error(webClientResponseException)); StepVerifier.create(arrangementService.getArrangement(internalId)).verifyComplete(); - verify(arrangementsApi).getArrangementById(internalId, false); + verify(arrangementsApi).getArrangementById(internalId, false, null); } @Test @@ -401,14 +401,14 @@ void deleteArrangementByInternalId() { arrangementsDeleteResponseElement.setValue(arrangementItem.getExternalArrangementId()); arrangementsDeleteResponseElement.setSelector(ArrangementsDeleteResponseElement.SelectorEnum.EXTERNAL_ID); - when(arrangementsApi.getArrangementById(arrangementInternalId, false)).thenReturn(Mono.just(arrangementItem)); + when(arrangementsApi.getArrangementById(arrangementInternalId, false, null)).thenReturn(Mono.just(arrangementItem)); when(arrangementsApi.postDelete(arrangementsDeleteItemSet)).thenReturn( Flux.just(arrangementsDeleteResponseElement)); StepVerifier.create(arrangementService.deleteArrangementByInternalId(arrangementInternalId)) .expectNext(arrangementInternalId).verifyComplete(); - verify(arrangementsApi).getArrangementById(arrangementInternalId, false); + verify(arrangementsApi).getArrangementById(arrangementInternalId, false, null); verify(arrangementsApi).postDelete(arrangementsDeleteItemSet); } @@ -419,13 +419,13 @@ void deleteArrangementByInternalId_GetArrangement_Failure() { WebClientResponseException webClientResponseException = buildWebClientResponseException( HttpStatus.INTERNAL_SERVER_ERROR, "Some error"); - when(arrangementsApi.getArrangementById(arrangementInternalId, false)).thenReturn( + when(arrangementsApi.getArrangementById(arrangementInternalId, false, null)).thenReturn( Mono.error(webClientResponseException)); StepVerifier.create(arrangementService.deleteArrangementByInternalId(arrangementInternalId)) .expectNext(arrangementInternalId).verifyComplete(); - verify(arrangementsApi).getArrangementById(arrangementInternalId, false); + verify(arrangementsApi).getArrangementById(arrangementInternalId, false, null); verify(arrangementsApi, times(0)).postDelete(anySet()); } @@ -435,7 +435,7 @@ void deleteArrangementByInternalId_DeleteArrangement_Failure() { ArrangementItem accountArrangementItem = new ArrangementItem().externalArrangementId("ext_arr_id"); - when(arrangementsApi.getArrangementById(arrangementInternalId, false)).thenReturn( + when(arrangementsApi.getArrangementById(arrangementInternalId, false, null)).thenReturn( Mono.just(accountArrangementItem)); WebClientResponseException webClientResponseException = buildWebClientResponseException( HttpStatus.INTERNAL_SERVER_ERROR, "Some error"); @@ -453,7 +453,7 @@ void deleteArrangementByInternalId_DeleteArrangement_Failure() { Assertions.assertEquals("500 Some error", e.getMessage()); }).verify(); - verify(arrangementsApi).getArrangementById(arrangementInternalId, false); + verify(arrangementsApi).getArrangementById(arrangementInternalId, false, null); verify(arrangementsApi).postDelete(arrangementsDeleteItemSet); } diff --git a/stream-sdk/stream-parent/pom.xml b/stream-sdk/stream-parent/pom.xml index 9c3f310bc..aabf5426d 100644 --- a/stream-sdk/stream-parent/pom.xml +++ b/stream-sdk/stream-parent/pom.xml @@ -5,7 +5,7 @@ com.backbase.buildingblocks backbase-parent - 20.0.0 + 20.1.0 @@ -38,7 +38,7 @@ 21 - 20.0.0 + 20.1.0 true diff --git a/stream-sdk/stream-starter-parents/stream-http-starter-parent/pom.xml b/stream-sdk/stream-starter-parents/stream-http-starter-parent/pom.xml index 4a5e91ceb..6ed8266b2 100644 --- a/stream-sdk/stream-starter-parents/stream-http-starter-parent/pom.xml +++ b/stream-sdk/stream-starter-parents/stream-http-starter-parent/pom.xml @@ -28,7 +28,7 @@ ${project.build.directory}/generated-sources ${codegen.generated-sources-dir}/annotations ${codegen.generated-sources-dir}/openapi - 2024.0.1 + 2025.0.0 @@ -73,7 +73,7 @@ com.backbase.oss boat-maven-plugin - 0.17.62 + 0.17.66 org.codehaus.mojo diff --git a/stream-sdk/stream-starter-parents/stream-task-starter-parent/pom.xml b/stream-sdk/stream-starter-parents/stream-task-starter-parent/pom.xml index 473eee44a..518c3c6bd 100644 --- a/stream-sdk/stream-starter-parents/stream-task-starter-parent/pom.xml +++ b/stream-sdk/stream-starter-parents/stream-task-starter-parent/pom.xml @@ -24,7 +24,7 @@ provided provided - 2024.0.1 + 2025.0.0 diff --git a/stream-sdk/stream-starter/pom.xml b/stream-sdk/stream-starter/pom.xml index caf0395c4..63169cf07 100644 --- a/stream-sdk/stream-starter/pom.xml +++ b/stream-sdk/stream-starter/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.4 + 3.5.11 com.backbase.stream @@ -114,7 +114,7 @@ com.backbase.buildingblocks backbase-building-blocks-release - 19.0.0 + 20.1.0 pom import diff --git a/stream-transactions/transactions-core/src/main/java/com/backbase/stream/TransactionServiceImpl.java b/stream-transactions/transactions-core/src/main/java/com/backbase/stream/TransactionServiceImpl.java index bbfe7f2c4..939820e22 100644 --- a/stream-transactions/transactions-core/src/main/java/com/backbase/stream/TransactionServiceImpl.java +++ b/stream-transactions/transactions-core/src/main/java/com/backbase/stream/TransactionServiceImpl.java @@ -123,7 +123,8 @@ public Flux getTransactions(TransactionsQuery transactionsQuery transactionsQuery.getSize(), transactionsQuery.getOrderBy(), transactionsQuery.getDirection(), - transactionsQuery.getSecDirection()); + transactionsQuery.getSecDirection(), + transactionsQuery.getSort()); } /** diff --git a/stream-transactions/transactions-core/src/main/java/com/backbase/stream/transaction/TransactionsQuery.java b/stream-transactions/transactions-core/src/main/java/com/backbase/stream/transaction/TransactionsQuery.java index 77a060653..6e02d0b69 100644 --- a/stream-transactions/transactions-core/src/main/java/com/backbase/stream/transaction/TransactionsQuery.java +++ b/stream-transactions/transactions-core/src/main/java/com/backbase/stream/transaction/TransactionsQuery.java @@ -41,5 +41,6 @@ public class TransactionsQuery { private String orderBy; private String direction; private String secDirection; + private String sort; } diff --git a/stream-transactions/transactions-core/src/test/java/com/backbase/stream/TransactionServiceImplTest.java b/stream-transactions/transactions-core/src/test/java/com/backbase/stream/TransactionServiceImplTest.java index 9f582b8f6..66aa7897d 100644 --- a/stream-transactions/transactions-core/src/test/java/com/backbase/stream/TransactionServiceImplTest.java +++ b/stream-transactions/transactions-core/src/test/java/com/backbase/stream/TransactionServiceImplTest.java @@ -52,7 +52,7 @@ void getLatestTransactions_Success() { eq(bookingDateLessThan), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(arrangementId), - any(), any(), any(), any(), any(), any(), any(), eq(Integer.valueOf(size)), any(), any(), any() + any(), any(), any(), any(), any(), any(), any(), eq(Integer.valueOf(size)), any(), any(), any(), any() )).thenReturn(Flux.just(transactionItem1, transactionItem2)); // When @@ -83,7 +83,7 @@ void getLatestTransactions_NotFound_ReturnsEmpty() { eq(bookingDateLessThan), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(arrangementId), - any(), any(), any(), any(), any(), any(), any(), eq(Integer.valueOf(size)), any(), any(), any() + any(), any(), any(), any(), any(), any(), any(), eq(Integer.valueOf(size)), any(), any(), any(), any() )).thenReturn(Flux.error(notFoundException)); // When @@ -110,7 +110,7 @@ void getLatestTransactions_WhenErrorOccurs_PropagatesError() { eq(bookingDateLessThan), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(arrangementId), - any(), any(), any(), any(), any(), any(), any(), eq(Integer.valueOf(size)), any(), any(), any() + any(), any(), any(), any(), any(), any(), any(), eq(Integer.valueOf(size)), any(), any(), any(), any() )).thenReturn(Flux.error(runtimeException)); // When @@ -143,7 +143,7 @@ void getTransactions_Success() { eq(bookingDateLessThan), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(query.getArrangementId()), - any(), any(), any(), any(), any(), any(), any(), eq(query.getSize()), any(), any(), any() + any(), any(), any(), any(), any(), any(), any(), eq(query.getSize()), any(), any(), any(), any() )).thenReturn(Flux.just(transactionItem)); // When @@ -155,4 +155,3 @@ void getTransactions_Success() { .verifyComplete(); } } -