From 149f3a500cff796bceca8f2945ef822f9b209d9b Mon Sep 17 00:00:00 2001
From: kcichonczyk <kamil.cichonczyk@hyland.com>
Date: Mon, 20 Feb 2023 16:53:07 +0100
Subject: [PATCH] [ACS-4460] simplify required bean definitions

---
 .../transform/base/config/MTLSConfig.java      | 16 ----------------
 .../base/sfs/SharedFileStoreClient.java        | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
index 2ccc4739..84d932c8 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
@@ -55,16 +55,9 @@ import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 
-import static org.springframework.http.HttpHeaders.ACCEPT;
-import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 @Configuration
 public class MTLSConfig {
 
-    @Value("${filestore-url}")
-    private String url;
-
     @Value("${server.ssl.enabled:false}")
     boolean sslEnabled;
 
@@ -89,15 +82,6 @@ public class MTLSConfig {
     @Value("${server.ssl.trust.store.type:}")
     private String trustStoreType;
 
-    @Bean
-    public WebClient client(WebClient.Builder clientBuilder)
-    {
-            return clientBuilder.baseUrl(url.endsWith("/") ? url : url + "/")
-                    .defaultHeader(CONTENT_TYPE, APPLICATION_JSON_VALUE)
-                    .defaultHeader(ACCEPT, APPLICATION_JSON_VALUE)
-                    .build();
-    }
-
     @Bean
     public WebClient.Builder clientBuilder() throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException, UnrecoverableKeyException {
         if(sslEnabled)
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java b/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java
index 13e4b098..40fe931f 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,7 +26,10 @@
  */
 package org.alfresco.transform.base.sfs;
 
+import static org.springframework.http.HttpHeaders.ACCEPT;
+import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.HttpMethod.POST;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
 
 import java.io.File;
@@ -49,6 +52,8 @@ import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.WebClient;
 
+import javax.annotation.PostConstruct;
+
 /**
  * Simple Rest client that call Alfresco Shared File Store
  */
@@ -64,8 +69,19 @@ public class SharedFileStoreClient
     private RestTemplate restTemplate;
 
     @Autowired
+    private WebClient.Builder clientBuilder;
+
     private WebClient client;
 
+    @PostConstruct
+    public void init()
+    {
+        client = clientBuilder.baseUrl(url.endsWith("/") ? url : url + "/")
+                          .defaultHeader(CONTENT_TYPE, APPLICATION_JSON_VALUE)
+                          .defaultHeader(ACCEPT, APPLICATION_JSON_VALUE)
+                          .build();
+    }
+
     /**
      * Retrieves a file from Shared File Store using given file reference
      *