Modified the ContentMetadataEncodingStrategy class to take into account MaterialsDescription (note: MaterialsDescription and Encryption Context are stored in the same field, but you will never have both at the same time (one of them will always be empty

Author: Anirav Kareddy

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

@@ -80,11 +80,16 @@ private Map<String, String> addMetadataToMap(Map<String, String> map, Encryption
 
         try (JsonWriter jsonWriter = JsonWriter.create()) {
             jsonWriter.writeStartObject();
-            for (Map.Entry<String, String> entry : materials.encryptionContext().entrySet()) {
-                jsonWriter.writeFieldName(entry.getKey()).writeValue(entry.getValue());
+            if (!materials.encryptionContext().isEmpty() && materials.materialsDescription().isEmpty()) {
+                for (Map.Entry<String, String> entry : materials.encryptionContext().entrySet()) {
+                    jsonWriter.writeFieldName(entry.getKey()).writeValue(entry.getValue());
+                }
+            } else if (materials.encryptionContext().isEmpty() && !materials.materialsDescription().isEmpty()) {
+                for (Map.Entry<String, String> entry : materials.materialsDescription().entrySet()) {
+                        jsonWriter.writeFieldName(entry.getKey()).writeValue(entry.getValue());
+                }
             }
             jsonWriter.writeEndObject();
-
             String jsonEncryptionContext = new String(jsonWriter.getBytes(), StandardCharsets.UTF_8);
             metadata.put(MetadataKeyConstants.ENCRYPTED_DATA_KEY_CONTEXT, jsonEncryptionContext);
         } catch (JsonWriter.JsonGenerationException e) {