refactoring to relax dependency injection rules

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/common/configuration/AppInitializer.java

@@ -3,28 +3,42 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import software.amazon.awssdk.services.s3.S3Client;
 import uk.nhs.adaptors.gp2gp.common.storage.StorageConnectorConfiguration;
 
 @Component(value = "appInitializer")
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AppInitializer implements InitializingBean {
+
+    private static final String S3_PREFIX = "s3";
     private final StorageConnectorConfiguration storageConnectorConfiguration;
-    private final CustomTrustStore customTrustStore;
 
     @Override
     public void afterPropertiesSet() {
         LOGGER.info("Running app initializer");
         if (StringUtils.isNotBlank(storageConnectorConfiguration.getTrustStoreUrl())) {
             LOGGER.info("Adding custom TrustStore to default one");
+            final CustomTrustStore customTrustStore = new CustomTrustStore(getS3Client());
             customTrustStore.addToDefault(storageConnectorConfiguration.getTrustStoreUrl(),
                 storageConnectorConfiguration.getTrustStorePassword());
         } else {
             LOGGER.warn("Trust store URL is not set. Running service without the trust store.");
         }
     }
+
+    @Bean
+    public S3Client getS3Client() {
+        if (StringUtils.isNotBlank(storageConnectorConfiguration.getTrustStoreUrl())
+            && storageConnectorConfiguration.getTrustStoreUrl().startsWith(S3_PREFIX)) {
+            return S3Client.builder().build();
+        }
+
+        return null;
+    }
 }

service/src/main/java/uk/nhs/adaptors/gp2gp/common/configuration/CustomTrustStore.java

@@ -9,9 +9,6 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.services.s3.S3Uri;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
@@ -23,14 +20,12 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
-@Component
 @Slf4j
 @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "S3Client is immutable and thread-safe.")
 public class CustomTrustStore {
 
     private final S3Client s3Client;
 
-    @Autowired
     public CustomTrustStore(S3Client s3Client) {
         this.s3Client = s3Client;
     }

service/src/main/java/uk/nhs/adaptors/gp2gp/common/storage/StorageConnectorConfiguration.java

@@ -1,12 +1,7 @@
 package uk.nhs.adaptors.gp2gp.common.storage;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import software.amazon.awssdk.services.s3.S3Client;
-
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,20 +11,10 @@
 @ConfigurationProperties(prefix = "gp2gp.storage")
 public class StorageConnectorConfiguration {
 
-    private static final String S3_PREFIX = "s3";
-
     private String type;
     private String containerName;
     private String azureConnectionString;
     private String trustStoreUrl;
     private String trustStorePassword;
 
-    @Bean
-    public S3Client getS3Client() {
-        if (StringUtils.isNotBlank(trustStoreUrl) && trustStoreUrl.startsWith(S3_PREFIX)) {
-            return S3Client.builder().build();
-        }
-
-        return null;
-    }
 }