rennamed variables + moving things around

Author: Anirav Kareddy

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

@@ -113,8 +113,8 @@ public Builder encryptedDataKeyAlgorithm(String encryptedDataKeyAlgorithm) {
             return this;
         }
 
-        public Builder encryptedDataKeyContext(Map<String, String> encryptedDataKeyContext) {
-            _encryptionContextOrMatDesc = Collections.unmodifiableMap(encryptedDataKeyContext);
+        public Builder encryptionContextOrMatDesc(Map<String, String> encryptionContextOrMatDesc) {
+            _encryptionContextOrMatDesc = Collections.unmodifiableMap(encryptionContextOrMatDesc);
             return this;
         }
 

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

@@ -136,8 +136,8 @@ private ContentMetadata readFromMap(Map<String, String> metadata, GetObjectRespo
                 .keyProviderInfo(keyProviderInfo.getBytes(StandardCharsets.UTF_8))
                 .build();
 
-        // Get encrypted data key encryption context
-        final Map<String, String> encryptionContext = new HashMap<>();
+        // Get encrypted data key encryption context or materials description (depending on the keyring)
+        final Map<String, String> encryptionContextOrMatDesc = new HashMap<>();
         // The V2 client treats null value here as empty, do the same to avoid incompatibility
         String jsonEncryptionContext = metadata.getOrDefault(MetadataKeyConstants.ENCRYPTED_DATA_KEY_CONTEXT, "{}");
         // When the encryption context contains non-US-ASCII characters,
@@ -149,7 +149,7 @@ private ContentMetadata readFromMap(Map<String, String> metadata, GetObjectRespo
             JsonNode objectNode = parser.parse(decodedJsonEncryptionContext);
 
             for (Map.Entry<String, JsonNode> entry : objectNode.asObject().entrySet()) {
-                encryptionContext.put(entry.getKey(), entry.getValue().asString());
+                encryptionContextOrMatDesc.put(entry.getKey(), entry.getValue().asString());
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -161,7 +161,7 @@ private ContentMetadata readFromMap(Map<String, String> metadata, GetObjectRespo
         return ContentMetadata.builder()
                 .algorithmSuite(algorithmSuite)
                 .encryptedDataKey(edk)
-                .encryptedDataKeyContext(encryptionContext)
+                .encryptionContextOrMatDesc(encryptionContextOrMatDesc)
                 .contentIv(iv)
                 .contentRange(contentRange)
                 .build();