Migrate from v1 to v2 of AWS SDK for Java

v1 stops getting updates as of Dec 2025

Author: adrianclay

service/build.gradle

@@ -49,7 +49,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-logging'
 
 	// Infrastructure
-	implementation 'com.amazonaws:aws-java-sdk-s3:1.12.767'
+	implementation 'software.amazon.awssdk:s3:2.27.17'
 	implementation ('com.azure:azure-storage-blob:12.27.1')
 	implementation 'org.apache.qpid:qpid-jms-client:2.5.0'
 

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

@@ -1,5 +1,6 @@
 package uk.nhs.adaptors.gp2gp.common.configuration;
 
+import java.net.URI;
 import java.security.KeyStore;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -11,10 +12,11 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3URI;
-import com.amazonaws.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.services.s3.S3Uri;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.NoArgsConstructor;
@@ -27,12 +29,13 @@
 @NoArgsConstructor
 public class CustomTrustStore {
     @Autowired(required = false)
-    private AmazonS3 s3Client;
+    private S3Client s3Client;
 
     @SneakyThrows
     public void addToDefault(String trustStorePath, String trustStorePassword) {
         final X509TrustManager defaultTrustManager = getDefaultTrustManager();
-        final X509TrustManager customTrustManager = getCustomDbTrustManager(new AmazonS3URI(trustStorePath), trustStorePassword);
+        final var s3Uri = s3Client.utilities().parseUri(URI.create(trustStorePath));
+        final X509TrustManager customTrustManager = getCustomDbTrustManager(s3Uri, trustStorePassword);
         X509TrustManager combinedTrustManager = new CombinedTrustManager(customTrustManager, defaultTrustManager);
 
         SSLContext sslContext = SSLContext.getInstance("TLS");
@@ -56,15 +59,15 @@ private X509TrustManager getDefaultTrustManager() {
 
     @SneakyThrows
     @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
-    private X509TrustManager getCustomDbTrustManager(AmazonS3URI s3URI, String trustStorePassword) {
+    private X509TrustManager getCustomDbTrustManager(S3Uri s3Uri, String trustStorePassword) {
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         trustManagerFactory.init((KeyStore) null);
 
-        LOGGER.info("Loading custom KeyStore from '{}'", s3URI.toString());
-        try (var s3Object = s3Client.getObject(new GetObjectRequest(s3URI.getBucket(), s3URI.getKey()));
-                var content = s3Object.getObjectContent()) {
+        LOGGER.info("Loading custom KeyStore from '{}'", s3Uri.toString());
+        final var getObjectRequest = GetObjectRequest.builder().bucket(s3Uri.bucket().orElseThrow()).key(s3Uri.key().orElseThrow()).build();
+        try (ResponseInputStream<GetObjectResponse> s3Object = s3Client.getObject(getObjectRequest)) {
             KeyStore customKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            customKeyStore.load(content, trustStorePassword.toCharArray());
+            customKeyStore.load(s3Object, trustStorePassword.toCharArray());
             trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
             trustManagerFactory.init(customKeyStore);
         }

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

@@ -2,44 +2,41 @@
 
 import java.io.InputStream;
 
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3Object;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 
 public class S3StorageConnector implements StorageConnector {
-    private final AmazonS3 s3client;
+    private final S3Client s3client;
     private final String bucketName;
 
     protected S3StorageConnector(StorageConnectorConfiguration configuration) {
         this.bucketName = configuration.getContainerName();
-        this.s3client = AmazonS3ClientBuilder
-            .standard()
-            .build();
+        this.s3client = S3Client.builder().build();
     }
 
     @Override
     public void uploadToStorage(InputStream is, long streamLength, String filename) throws StorageConnectorException {
         try {
-            ObjectMetadata metadata = new ObjectMetadata();
-            metadata.setContentLength(streamLength);
+            final var putObjectRequest = PutObjectRequest.builder().bucket(bucketName).key(filename).build();
 
             s3client.putObject(
-                bucketName,
-                filename,
-                is,
-                metadata
+                putObjectRequest,
+                RequestBody.fromInputStream(is, streamLength)
             );
         } catch (Exception exception) {
             throw new StorageConnectorException("Error occurred uploading to S3 Bucket", exception);
         }
     }
 
     @Override
-    public InputStream downloadFromStorage(String filename) throws StorageConnectorException {
+    public ResponseInputStream<GetObjectResponse> downloadFromStorage(String filename) throws StorageConnectorException {
         try {
-            S3Object s3Object = s3client.getObject(bucketName, filename);
-            return s3Object.getObjectContent();
+            final var request = GetObjectRequest.builder().bucket(bucketName).key(filename).build();
+            return s3client.getObject(request);
         } catch (Exception exception) {
             throw new StorageConnectorException("Error occurred downloading from S3 Bucket", exception);
         }

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

@@ -5,8 +5,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import software.amazon.awssdk.services.s3.S3Client;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -25,11 +24,9 @@ public class StorageConnectorConfiguration {
     private String trustStorePassword;
 
     @Bean
-    @SuppressWarnings("unused")
-    public AmazonS3 getS3Client() {
+    public S3Client getS3Client() {
         if (StringUtils.isNotBlank(trustStoreUrl) && trustStoreUrl.startsWith(S3_PREFIX)) {
-            return AmazonS3ClientBuilder.standard()
-                .build();
+            return S3Client.builder().build();
         }
 
         return null;