declare metadata values within method

Author: DavidMcClatchey

backend/src/main/java/gov/cdc/usds/simplereport/config/AimsProperties.java

@@ -1,8 +1,5 @@
 package gov.cdc.usds.simplereport.config;
 
-import java.util.HashMap;
-import java.util.Map;
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -31,9 +28,6 @@ public class AimsProperties {
   private String sendingEnvironment;
   private String receivingEnvironment;
 
-  @Getter(AccessLevel.NONE)
-  private Map<String, String> s3Metadata;
-
   @Bean
   public S3Client getS3Client() {
     return S3Client.builder()
@@ -43,8 +37,4 @@ public S3Client getS3Client() {
                 AwsBasicCredentials.create(accessKeyId, secretAccessKey)))
         .build();
   }
-
-  public Map<String, String> getS3Metadata() {
-    return (s3Metadata == null) ? null : new HashMap<>(s3Metadata);
-  }
 }

backend/src/main/java/gov/cdc/usds/simplereport/service/AimsReportingService.java

@@ -41,10 +41,16 @@ String generateFilename(UUID submissionId) {
   private PutObjectResponse putObjectInAimsBucket(UUID submissionId, String objectBody) {
     String filename = generateFilename(submissionId);
     String objectKey = aimsProperties.getUserId() + "/SendTo/" + filename;
-
-    Map<String, String> metadata = aimsProperties.getS3Metadata();
-    metadata.put("AIMSPlatformFilename", filename);
-    metadata.put("AIMSPlatformSenderMessageId", submissionId.toString());
+    Map<String, String> metadata =
+        Map.ofEntries(
+            Map.entry("AIMSPlatformSender", "SimpleReport"),
+            Map.entry("AIMSPlatformRecipient", "AIMSPlatform"),
+            Map.entry("AIMSPlatformSenderProject", "ELR"),
+            Map.entry("AIMSPlatformSenderProtocol", "S3"),
+            Map.entry("AIMSPlatformSenderEncryptionType", "KMS"),
+            Map.entry("Base64Encoded", "False"),
+            Map.entry("AIMSPlatformFilename", filename),
+            Map.entry("AIMSPlatformSenderMessageId", submissionId.toString()));
 
     try {
       return s3Client.putObject(

backend/src/main/resources/application.yaml

@@ -209,13 +209,6 @@ aims:
   message-queue-endpoint: ${AIMS_MESSAGE_QUEUE_ENDPOINT:super-secret-message-queue-endpoint}
   sending-environment: ${AIMS_ENVIRONMENT:Test}
   receiving-environment: ${AIMS_ENVIRONMENT:Test}
-  s3-metadata:
-    AIMSPlatformSender: SimpleReport
-    AIMSPlatformRecipient: AIMSPlatform
-    AIMSPlatformSenderProject: ELR
-    AIMSPlatformSenderProtocol: S3
-    AIMSPlatformSenderEncryptionType: KMS
-    Base64Encoded: "False"
 features:
   oktaMigrationEnabled: false
   chlamydiaEnabled: true