step 1 - refactoring

Author: kessplas

src/main/java/software/amazon/encryption/s3/internal/ContentMetadataEncodingStrategy.java

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 package software.amazon.encryption.s3.internal;
 
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.encryption.s3.materials.EncryptionMaterials;
 
-import java.util.Map;
-
-@FunctionalInterface
 public interface ContentMetadataEncodingStrategy {
 
-    Map<String, String> encodeMetadata(EncryptionMaterials materials, byte[] iv,
-                                              Map<String, String> metadata);
+    PutObjectRequest encodeMetadata(EncryptionMaterials materials, byte[] iv, PutObjectRequest putObjectRequest);
+    CreateMultipartUploadRequest encodeMetadata(EncryptionMaterials materials, byte[] iv, CreateMultipartUploadRequest createMultipartUploadRequest);
+
 }

src/main/java/software/amazon/encryption/s3/internal/InstructionFileConfig.java

@@ -16,6 +16,7 @@ public class InstructionFileConfig {
     final private InstructionFileClientType _clientType;
     final private S3AsyncClient _s3AsyncClient;
     final private S3Client _s3Client;
+    final private boolean _enableInstructionFilePut;
 
     private InstructionFileConfig(final Builder builder) {
         _clientType = builder._clientType;

src/main/java/software/amazon/encryption/s3/internal/MultipartUploadObjectPipeline.java

@@ -67,11 +67,10 @@ public CreateMultipartUploadResponse createMultipartUpload(CreateMultipartUpload
 
         MultipartEncryptedContent encryptedContent = _contentEncryptionStrategy.initMultipartEncryption(materials);
 
-        Map<String, String> metadata = new HashMap<>(request.metadata());
-        metadata = _contentMetadataEncodingStrategy.encodeMetadata(materials, encryptedContent.getIv(), metadata);
-        request = request.toBuilder()
+        CreateMultipartUploadRequest createMpuRequest = _contentMetadataEncodingStrategy.encodeMetadata(materials, encryptedContent.getIv(), request);
+        request = createMpuRequest.toBuilder()
                 .overrideConfiguration(API_NAME_INTERCEPTOR)
-                .metadata(metadata).build();
+                .build();
 
         CreateMultipartUploadResponse response = _s3AsyncClient.createMultipartUpload(request).join();
 

src/main/java/software/amazon/encryption/s3/internal/ObjectMetadataEncodingStrategy.java

@@ -1,21 +1,37 @@
 package software.amazon.encryption.s3.internal;
 
 import software.amazon.awssdk.protocols.jsoncore.JsonWriter;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.encryption.s3.S3EncryptionClientException;
 import software.amazon.encryption.s3.materials.EncryptedDataKey;
 import software.amazon.encryption.s3.materials.EncryptionMaterials;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.HashMap;
 import java.util.Map;
 
 public class ObjectMetadataEncodingStrategy implements ContentMetadataEncodingStrategy {
 
     private static final Base64.Encoder ENCODER = Base64.getEncoder();
 
-    @Override
-    public Map<String, String> encodeMetadata(EncryptionMaterials materials, byte[] iv,
-                                              Map<String, String> metadata) {
+    public PutObjectRequest encodeMetadata(EncryptionMaterials materials, byte[] iv, PutObjectRequest putObjectRequest) {
+        Map<String, String> newMetadata = addMetadataToMap(putObjectRequest.metadata(), materials, iv);
+        return putObjectRequest.toBuilder()
+                .metadata(newMetadata)
+                .build();
+    }
+
+    public CreateMultipartUploadRequest encodeMetadata(EncryptionMaterials materials, byte[] iv, CreateMultipartUploadRequest createMultipartUploadRequest) {
+        Map<String, String> newMetadata = addMetadataToMap(createMultipartUploadRequest.metadata(), materials, iv);
+        return createMultipartUploadRequest.toBuilder()
+                .metadata(newMetadata)
+                .build();
+    }
+
+    private Map<String, String> addMetadataToMap(Map<String, String> map, EncryptionMaterials materials, byte[] iv) {
+        Map<String, String> metadata = new HashMap<>(map);
         EncryptedDataKey edk = materials.encryptedDataKeys().get(0);
         metadata.put(MetadataKeyConstants.ENCRYPTED_DATA_KEY_V2, ENCODER.encodeToString(edk.encryptedDatakey()));
         metadata.put(MetadataKeyConstants.CONTENT_IV, ENCODER.encodeToString(iv));
@@ -37,5 +53,4 @@ public Map<String, String> encodeMetadata(EncryptionMaterials materials, byte[]
         }
         return metadata;
     }
-
 }

src/main/java/software/amazon/encryption/s3/internal/PutEncryptedObjectPipeline.java

@@ -14,8 +14,6 @@
 import software.amazon.encryption.s3.materials.EncryptionMaterialsRequest;
 
 import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 import static software.amazon.encryption.s3.internal.ApiNameVersion.API_NAME_INTERCEPTOR;
@@ -70,12 +68,10 @@ public CompletableFuture<PutObjectResponse> putObject(PutObjectRequest request,
 
         EncryptedContent encryptedContent = _asyncContentEncryptionStrategy.encryptContent(materials, requestBody);
 
-        Map<String, String> metadata = new HashMap<>(request.metadata());
-        metadata = _contentMetadataEncodingStrategy.encodeMetadata(materials, encryptedContent.getIv(), metadata);
-        PutObjectRequest encryptedPutRequest = request.toBuilder()
+        PutObjectRequest modifiedRequest = _contentMetadataEncodingStrategy.encodeMetadata(materials, encryptedContent.getIv(), request);
+        PutObjectRequest encryptedPutRequest = modifiedRequest.toBuilder()
                 .overrideConfiguration(API_NAME_INTERCEPTOR)
                 .contentLength(encryptedContent.getCiphertextLength())
-                .metadata(metadata)
                 .build();
         return _s3AsyncClient.putObject(encryptedPutRequest, encryptedContent.getAsyncCiphertext());
     }