S3 Message Customization (#301)

Adding support for custom headers and custom query parameters to generated requests.

Author: rccarper

pom.xml

@@ -256,6 +256,12 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>

s3-native-client/build.gradle.kts

@@ -27,6 +27,6 @@ dependencies {
     implementation(project(":smithy-crt"))
     implementation(rootProject)
 
-    testImplementation(testFixtures(rootProject))
+    testImplementation("org.mockito:mockito-all:1.10.19")
     testImplementation("junit:junit:4.13.1")    //matches dependency as parent pom.xml
 }

s3-native-client/src/generated/java/com/amazonaws/s3/model/GetObjectRequest.java

@@ -9,6 +9,7 @@
 import java.time.Instant;
 import java.util.Objects;
 import software.amazon.aws.sdk.crt.annotations.Generated;
+import software.amazon.awssdk.crt.http.HttpHeader;
 
 @Generated("software.amazon.smithy.crt.java.StructureGenerator")
 public class GetObjectRequest {
@@ -128,6 +129,10 @@ public class GetObjectRequest {
      */
     String expectedBucketOwner;
 
+    HttpHeader[] customHeaders;
+
+    String customQueryParameters;
+
     GetObjectRequest() {
         this.bucket = "";
         this.ifMatch = "";
@@ -149,6 +154,8 @@ public class GetObjectRequest {
         this.requestPayer = null;
         this.partNumber = null;
         this.expectedBucketOwner = "";
+        this.customHeaders = null;
+        this.customQueryParameters = "";
     }
 
     protected GetObjectRequest(BuilderImpl builder) {
@@ -172,6 +179,8 @@ protected GetObjectRequest(BuilderImpl builder) {
         this.requestPayer = builder.requestPayer;
         this.partNumber = builder.partNumber;
         this.expectedBucketOwner = builder.expectedBucketOwner;
+        this.customHeaders = builder.customHeaders;
+        this.customQueryParameters = builder.customQueryParameters;
     }
 
     public Builder toBuilder() {
@@ -273,6 +282,14 @@ public String expectedBucketOwner() {
         return expectedBucketOwner;
     }
 
+    public HttpHeader[] customHeaders() {
+        return customHeaders;
+    }
+
+    public String customQueryParameters() {
+        return customQueryParameters;
+    }
+
     public interface Builder {
         Builder bucket(String bucket);
 
@@ -314,6 +331,10 @@ public interface Builder {
 
         Builder expectedBucketOwner(String expectedBucketOwner);
 
+        Builder customHeaders(HttpHeader[] customHeaders);
+
+        Builder customQueryParameters(String customQueryParameters);
+
         GetObjectRequest build();
     }
 
@@ -434,6 +455,10 @@ protected static class BuilderImpl implements Builder {
          */
         String expectedBucketOwner;
 
+        HttpHeader[] customHeaders;
+
+        String customQueryParameters;
+
         protected BuilderImpl() {
         }
 
@@ -458,6 +483,8 @@ private BuilderImpl(GetObjectRequest model) {
             requestPayer(model.requestPayer);
             partNumber(model.partNumber);
             expectedBucketOwner(model.expectedBucketOwner);
+            customHeaders(model.customHeaders);
+            customQueryParameters(model.customQueryParameters);
         }
 
         public GetObjectRequest build() {
@@ -564,6 +591,16 @@ public final Builder expectedBucketOwner(String expectedBucketOwner) {
             return this;
         }
 
+        public final Builder customHeaders(HttpHeader[] customHeaders) {
+            this.customHeaders = customHeaders;
+            return this;
+        }
+
+        public final Builder customQueryParameters(String customQueryParameters) {
+            this.customQueryParameters = customQueryParameters;
+            return this;
+        }
+
         @Override
         public int hashCode() {
             return Objects.hash(BuilderImpl.class);
@@ -654,5 +691,13 @@ public Integer partNumber() {
         public String expectedBucketOwner() {
             return expectedBucketOwner;
         }
+
+        public HttpHeader[] customHeaders() {
+            return customHeaders;
+        }
+
+        public String customQueryParameters() {
+            return customQueryParameters;
+        }
     }
 }

s3-native-client/src/generated/java/com/amazonaws/s3/model/PutObjectRequest.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.Objects;
 import software.amazon.aws.sdk.crt.annotations.Generated;
+import software.amazon.awssdk.crt.http.HttpHeader;
 
 @Generated("software.amazon.smithy.crt.java.StructureGenerator")
 public class PutObjectRequest {
@@ -237,6 +238,10 @@ public class PutObjectRequest {
      */
     String expectedBucketOwner;
 
+    HttpHeader[] customHeaders;
+
+    String customQueryParameters;
+
     PutObjectRequest() {
         this.aCL = null;
         this.body = null;
@@ -270,6 +275,8 @@ public class PutObjectRequest {
         this.objectLockRetainUntilDate = null;
         this.objectLockLegalHoldStatus = null;
         this.expectedBucketOwner = "";
+        this.customHeaders = null;
+        this.customQueryParameters = "";
     }
 
     protected PutObjectRequest(BuilderImpl builder) {
@@ -305,6 +312,8 @@ protected PutObjectRequest(BuilderImpl builder) {
         this.objectLockRetainUntilDate = builder.objectLockRetainUntilDate;
         this.objectLockLegalHoldStatus = builder.objectLockLegalHoldStatus;
         this.expectedBucketOwner = builder.expectedBucketOwner;
+        this.customHeaders = builder.customHeaders;
+        this.customQueryParameters = builder.customQueryParameters;
     }
 
     public Builder toBuilder() {
@@ -454,6 +463,14 @@ public String expectedBucketOwner() {
         return expectedBucketOwner;
     }
 
+    public HttpHeader[] customHeaders() {
+        return customHeaders;
+    }
+
+    public String customQueryParameters() {
+        return customQueryParameters;
+    }
+
     public interface Builder {
         Builder aCL(ObjectCannedACL aCL);
 
@@ -519,6 +536,10 @@ public interface Builder {
 
         Builder expectedBucketOwner(String expectedBucketOwner);
 
+        Builder customHeaders(HttpHeader[] customHeaders);
+
+        Builder customQueryParameters(String customQueryParameters);
+
         PutObjectRequest build();
     }
 
@@ -746,6 +767,10 @@ protected static class BuilderImpl implements Builder {
          */
         String expectedBucketOwner;
 
+        HttpHeader[] customHeaders;
+
+        String customQueryParameters;
+
         protected BuilderImpl() {
         }
 
@@ -782,6 +807,8 @@ private BuilderImpl(PutObjectRequest model) {
             objectLockRetainUntilDate(model.objectLockRetainUntilDate);
             objectLockLegalHoldStatus(model.objectLockLegalHoldStatus);
             expectedBucketOwner(model.expectedBucketOwner);
+            customHeaders(model.customHeaders);
+            customQueryParameters(model.customQueryParameters);
         }
 
         public PutObjectRequest build() {
@@ -949,6 +976,16 @@ public final Builder expectedBucketOwner(String expectedBucketOwner) {
             return this;
         }
 
+        public final Builder customHeaders(HttpHeader[] customHeaders) {
+            this.customHeaders = customHeaders;
+            return this;
+        }
+
+        public final Builder customQueryParameters(String customQueryParameters) {
+            this.customQueryParameters = customQueryParameters;
+            return this;
+        }
+
         @Override
         public int hashCode() {
             return Objects.hash(BuilderImpl.class);
@@ -1087,5 +1124,13 @@ public ObjectLockLegalHoldStatus objectLockLegalHoldStatus() {
         public String expectedBucketOwner() {
             return expectedBucketOwner;
         }
+
+        public HttpHeader[] customHeaders() {
+            return customHeaders;
+        }
+
+        public String customQueryParameters() {
+            return customQueryParameters;
+        }
     }
 }