From ad0d4c68f0525ca0c4e0856f1a06de11d4d41e3f Mon Sep 17 00:00:00 2001
From: kcichonczyk <kamil.cichonczyk@hyland.com>
Date: Mon, 13 Mar 2023 20:56:44 +0100
Subject: [PATCH] [ACS-4460] MtlsTestUtils simplify methods

---
 .../java/org/alfresco/transform/base/MtlsTestUtils.java  | 9 +++++++++
 .../org/alfresco/transform/base/clients/HttpClient.java  | 2 +-
 .../org/alfresco/transform/base/clients/SfsClient.java   | 8 +++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
index 1ad3384f..f8e70401 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
@@ -62,4 +62,13 @@ public class MtlsTestUtils {
         }
         return new RestTemplate(requestFactory);
     }
+
+    public static RestTemplate getRestTemplate()
+    {
+        return MtlsTestUtils.isMtlsEnabled() ? MtlsTestUtils.restTemplateWithMtls() : new RestTemplate();
+    }
+
+    public static CloseableHttpClient getHttpClient() throws UnrecoverableKeyException, CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException {
+        return MtlsTestUtils.isMtlsEnabled() ? MtlsTestUtils.httpClientWithMtls() : HttpClients.createDefault();
+    }
 }
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/clients/HttpClient.java b/engines/base/src/test/java/org/alfresco/transform/base/clients/HttpClient.java
index def26b7b..ab51b887 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/clients/HttpClient.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/clients/HttpClient.java
@@ -28,7 +28,7 @@ import org.springframework.web.client.RestTemplate;
  */
 public class HttpClient
 {
-    private static final RestTemplate REST_TEMPLATE = MtlsTestUtils.isMtlsEnabled() ? MtlsTestUtils.restTemplateWithMtls() : new RestTemplate();
+    private static final RestTemplate REST_TEMPLATE = MtlsTestUtils.getRestTemplate();
 
     public static ResponseEntity<Resource> sendTRequest(
         final String engineUrl, final String sourceFile,
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/clients/SfsClient.java b/engines/base/src/test/java/org/alfresco/transform/base/clients/SfsClient.java
index 69f0d683..f31db5da 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/clients/SfsClient.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/clients/SfsClient.java
@@ -32,7 +32,6 @@ import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.LoggerFactory;
 
@@ -76,7 +75,7 @@ public class SfsClient
             .addPart("file", new FileBody(file, ContentType.DEFAULT_BINARY))
             .build());
 
-        try (CloseableHttpClient client = MtlsTestUtils.isMtlsEnabled() ? MtlsTestUtils.httpClientWithMtls() : HttpClients.createDefault())
+        try (CloseableHttpClient client = MtlsTestUtils.getHttpClient())
         {
             final HttpResponse response = client.execute(post);
             int status = response.getStatusLine().getStatusCode();
@@ -135,8 +134,7 @@ public class SfsClient
             sfsBaseUrl+"/alfresco/api/-default-/private/sfs/versions/1/file/{0}",
             uuid));
 
-        try (CloseableHttpClient client = MtlsTestUtils.isMtlsEnabled() ?
-                MtlsTestUtils.httpClientWithMtls() : HttpClients.createDefault())
+        try (CloseableHttpClient client = MtlsTestUtils.getHttpClient())
         {
             final HttpResponse response = client.execute(head);
             final int status = response.getStatusLine().getStatusCode();
@@ -155,7 +153,7 @@ public class SfsClient
             sfsBaseUrl+"/alfresco/api/-default-/private/sfs/versions/1/file/{0}",
             uuid));
 
-        try (CloseableHttpClient client = HttpClients.createDefault())
+        try (CloseableHttpClient client = MtlsTestUtils.getHttpClient())
         {
             final HttpResponse response = client.execute(get);
             final int status = response.getStatusLine().getStatusCode();