throws an exception if s3Client can't be initialized

Author: ORybak5

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

@@ -11,6 +11,8 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import uk.nhs.adaptors.gp2gp.common.storage.StorageConnectorConfiguration;
 
+import javax.naming.ConfigurationException;
+
 @Component(value = "appInitializer")
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
@@ -20,7 +22,7 @@ public class AppInitializer implements InitializingBean {
     private final StorageConnectorConfiguration storageConnectorConfiguration;
 
     @Override
-    public void afterPropertiesSet() {
+    public void afterPropertiesSet() throws ConfigurationException {
         LOGGER.info("Running app initializer");
         if (StringUtils.isNotBlank(storageConnectorConfiguration.getTrustStoreUrl())) {
             LOGGER.info("Adding custom TrustStore to default one");
@@ -33,12 +35,12 @@ public void afterPropertiesSet() {
     }
 
     @Bean
-    public S3Client getS3Client() {
+    public S3Client getS3Client() throws ConfigurationException {
         if (StringUtils.isNotBlank(storageConnectorConfiguration.getTrustStoreUrl())
             && storageConnectorConfiguration.getTrustStoreUrl().startsWith(S3_PREFIX)) {
             return S3Client.builder().build();
         }
 
-        return null;
+        throw new ConfigurationException("S3Client cannot be instantiated due to trust store URL misconfiguration");
     }
 }

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/AppInitializerTest.java

@@ -2,12 +2,14 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import software.amazon.awssdk.services.s3.S3Client;
 import uk.nhs.adaptors.gp2gp.common.storage.StorageConnectorConfiguration;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import javax.naming.ConfigurationException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class AppInitializerTest {
 
+    public static final String EXPECTED_ERROR_MESSAGE = "S3Client cannot be instantiated due to trust store URL misconfiguration";
     private AppInitializer appInitializer;
     private StorageConnectorConfiguration storageConnectorConfiguration;
 
@@ -22,9 +24,9 @@ void getNullWhenTrustStoreUrlDoesNotExists() {
         storageConnectorConfiguration.setTrustStoreUrl(null);
         appInitializer = new AppInitializer(storageConnectorConfiguration);
 
-        S3Client s3Client = appInitializer.getS3Client();
+        Exception exception = assertThrows(ConfigurationException.class, () -> appInitializer.getS3Client());
 
-        assertNull(s3Client);
+        assertEquals(EXPECTED_ERROR_MESSAGE, exception.getMessage());
     }
 
     @Test
@@ -33,8 +35,8 @@ void getNullWhenTrustStoreUrlDoesNotStartWithS3Prefix() {
         storageConnectorConfiguration.setTrustStoreUrl("http://localhost");
         appInitializer = new AppInitializer(storageConnectorConfiguration);
 
-        S3Client s3Client = appInitializer.getS3Client();
+        Exception exception = assertThrows(ConfigurationException.class, () -> appInitializer.getS3Client());
 
-        assertNull(s3Client);
+        assertEquals(EXPECTED_ERROR_MESSAGE, exception.getMessage());
     }
 }