WLNP-12183 : BSJ: Remove custom workaround to connect with Investment…

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [9.14.0]
+### Changed
+- Remove custom workaround to connect with Investment service
+
 ## [9.13.0]
 ### Changed
 - Update SSDK 20.1.0 and BBOM 2026.03 LTS, boat-maven-plugin unified 0.17.66

stream-investment/investment-core/src/main/java/com/backbase/stream/configuration/IngestConfigProperties.java

@@ -2,7 +2,6 @@
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * Fine-grained configuration properties for {@code InvestmentPortfolioService}.

stream-investment/investment-core/src/main/java/com/backbase/stream/configuration/InvestmentServiceConfiguration.java

@@ -1,6 +1,5 @@
 package com.backbase.stream.configuration;
 
-import com.backbase.investment.api.service.ApiClient;
 import com.backbase.investment.api.service.v1.AllocationsApi;
 import com.backbase.investment.api.service.v1.AssetUniverseApi;
 import com.backbase.investment.api.service.v1.AsyncBulkGroupsApi;
@@ -18,7 +17,6 @@
 import com.backbase.stream.investment.saga.InvestmentContentSaga;
 import com.backbase.stream.investment.saga.InvestmentSaga;
 import com.backbase.stream.investment.service.AsyncTaskService;
-import com.backbase.stream.investment.service.CustomIntegrationApiService;
 import com.backbase.stream.investment.service.InvestmentAssetPriceService;
 import com.backbase.stream.investment.service.InvestmentAssetUniverseService;
 import com.backbase.stream.investment.service.InvestmentClientService;
@@ -57,11 +55,6 @@ public InvestmentClientService investmentClientService(ClientApi clientApi) {
         return new InvestmentClientService(clientApi);
     }
 
-    @Bean
-    public CustomIntegrationApiService customIntegrationApiService(ApiClient apiClient) {
-        return new CustomIntegrationApiService(apiClient);
-    }
-
     @Bean
     public InvestmentPortfolioService investmentPortfolioService(PortfolioApi portfolioApi,
         InvestmentProductsApi investmentProductsApi, PaymentsApi paymentsApi,
@@ -83,9 +76,8 @@ public AsyncTaskService asyncTaskService(AsyncBulkGroupsApi asyncBulkGroupsApi)
     }
 
     @Bean
-    public InvestmentModelPortfolioService investmentModelPortfolioService(FinancialAdviceApi financialAdviceApi,
-        CustomIntegrationApiService customIntegrationApiService) {
-        return new InvestmentModelPortfolioService(financialAdviceApi, customIntegrationApiService);
+    public InvestmentModelPortfolioService investmentModelPortfolioService(FinancialAdviceApi financialAdviceApi) {
+        return new InvestmentModelPortfolioService(financialAdviceApi);
     }
 
     @Bean
@@ -101,9 +93,9 @@ public InvestmentIntradayAssetPriceService investmentIntradayAssetPriceService(A
     @Bean
     public InvestmentPortfolioAllocationService investmentPortfolioAllocationService(AllocationsApi allocationsApi,
         AssetUniverseApi assetUniverseApi, InvestmentApi investmentApi,
-        CustomIntegrationApiService customIntegrationApiService, IngestConfigProperties portfolioProperties) {
+        IngestConfigProperties portfolioProperties) {
         return new InvestmentPortfolioAllocationService(allocationsApi, assetUniverseApi, investmentApi,
-            customIntegrationApiService, portfolioProperties);
+            portfolioProperties);
     }
 
     @Bean

stream-investment/investment-core/src/main/java/com/backbase/stream/investment/service/InvestmentModelPortfolioService.java

@@ -42,7 +42,6 @@
 public class InvestmentModelPortfolioService {
 
     private final FinancialAdviceApi financialAdviceApi;
-    private final CustomIntegrationApiService customIntegrationApiService;
 
     public Flux<OASModelPortfolioResponse> upsertModels(InvestmentData investmentData) {
         return Flux.fromIterable(Objects.requireNonNullElse(investmentData.getModelPortfolios(), List.of()))
@@ -153,7 +152,7 @@ private Mono<OASModelPortfolioResponse> createNewModelPortfolio(
 
         log.info("Creating new model portfolio: name={}, riskLevel={}",
             modelPortfolio.getName(), modelPortfolio.getRiskLevel());
-        return customIntegrationApiService.createModelPortfolioRequestCreation(null, null, null,
+        return financialAdviceApi.createModelPortfolio(null, null, null,
                 modelPortfolio, null)
             .doOnSuccess(created -> log.info(
                 "Successfully created model portfolio: uuid={}, name={}, riskLevel={}",
@@ -168,7 +167,7 @@ private Mono<OASModelPortfolioResponse> patchModelPortfolio(UUID uuid,
         log.info("Patch model portfolio: name={}, riskLevel={}",
             modelPortfolio.getName(), modelPortfolio.getRiskLevel());
         log.debug("Patch model portfolio: uuid={}, object={}", uuid, modelPortfolio);
-        return customIntegrationApiService.patchModelPortfolioRequestCreation(uuid.toString(),
+        return financialAdviceApi.patchModelPortfolio(uuid.toString(),
                 null, null, null, modelPortfolio, null)
             .doOnSuccess(created -> log.info(
                 "Successfully patched model portfolio: uuid={}, name={}, riskLevel={}",

stream-investment/investment-core/src/main/java/com/backbase/stream/investment/service/InvestmentPortfolioAllocationService.java

@@ -76,7 +76,6 @@ public class InvestmentPortfolioAllocationService {
     private final AllocationsApi allocationsApi;
     private final AssetUniverseApi assetUniverseApi;
     private final InvestmentApi investmentApi;
-    private final CustomIntegrationApiService customIntegrationApiService;
     private final IngestConfigProperties ingestProperties;
 
     public Mono<Void> removeAllocations(PortfolioList portfolio) {
@@ -156,7 +155,7 @@ private Mono<List<OASAllocationCreateRequest>> generateAllocations(
     private Mono<List<OASPortfolioAllocation>> upsertAllocations(String portfolioId,
         List<OASAllocationCreateRequest> allocations) {
         return Flux.fromIterable(allocations)
-            .flatMap(a -> customIntegrationApiService.createPortfolioAllocation(portfolioId, a, null, null, null),
+            .flatMap(a -> allocationsApi.createPortfolioAllocation(portfolioId, a, null, null, null),
                 ingestProperties.getAllocation().getAllocationConcurrency())
 
             .collectList().doOnSuccess(