modified the materialsDescription builder setter method to take into account null case

Anirav Kareddy · Anirav Kareddy · commit 241889dc02d6 · 2025-06-20T15:34:50.000-07:00
diff --git a/src/main/java/software/amazon/encryption/s3/materials/EncryptionMaterials.java b/src/main/java/software/amazon/encryption/s3/materials/EncryptionMaterials.java
@@ -138,7 +138,7 @@ static public class Builder {
         private byte[] _plaintextDataKey = null;
         private long _plaintextLength = -1;
         private Provider _cryptoProvider = null;
-        private MaterialsDescription _materialsDescription;
+        private MaterialsDescription _materialsDescription = MaterialsDescription.builder().build();
 
         private Builder() {
         }
@@ -153,7 +153,9 @@ public Builder algorithmSuite(AlgorithmSuite algorithmSuite) {
             return this;
         }
         public Builder materialsDescription(MaterialsDescription materialsDescription) {
-            _materialsDescription = materialsDescription;
+            _materialsDescription = materialsDescription == null
+                    ? MaterialsDescription.builder().build()
+                    : materialsDescription;
             return this;
         }
         public Builder encryptionContext(Map<String, String> encryptionContext) {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static public class Builder {`
`138`	`138`	`private byte[] _plaintextDataKey = null;`
`139`	`139`	`private long _plaintextLength = -1;`
`140`	`140`	`private Provider _cryptoProvider = null;`
`141`		`- private MaterialsDescription _materialsDescription;`
	`141`	`+ private MaterialsDescription _materialsDescription = MaterialsDescription.builder().build();`
`142`	`142`
`143`	`143`	`private Builder() {`
`144`	`144`	`}`
`@@ -153,7 +153,9 @@ public Builder algorithmSuite(AlgorithmSuite algorithmSuite) {`
`153`	`153`	`return this;`
`154`	`154`	`}`
`155`	`155`	`public Builder materialsDescription(MaterialsDescription materialsDescription) {`
`156`		`- _materialsDescription = materialsDescription;`
	`156`	`+ _materialsDescription = materialsDescription == null`
	`157`	`+ ? MaterialsDescription.builder().build()`
	`158`	`+ : materialsDescription;`
`157`	`159`	`return this;`
`158`	`160`	`}`
`159`	`161`	`public Builder encryptionContext(Map<String, String> encryptionContext) {`