try 2.21.46

aws · Oct 24, 2024 · d133ddc · d133ddc
1 parent 3a50cc8
commit d133ddc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.release>8</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <aws.java.sdk.version>2.20.162</aws.java.sdk.version>
+    <aws.java.sdk.version>2.21.46</aws.java.sdk.version>
     <aws.java.crt.version>0.29.24</aws.java.crt.version>
     <com.amazonaws.version>1.12.441</com.amazonaws.version>
   </properties>

diff --git a/src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java b/src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java
@@ -706,11 +706,11 @@ public Builder disableMultiRegionAccessPoints(Boolean disableMultiRegionAccessPo
             return this;
         }
 
-        // @Override
-        // public S3AsyncClientBuilder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
-        //     _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
-        //     return this;
-        // }
+        @Override
+        public S3AsyncClientBuilder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
+            _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
+            return this;
+        }
 
         /**
          * Forces this client to use path-style addressing for buckets.
@@ -791,7 +791,7 @@ public S3AsyncEncryptionClient build() {
                         .serviceConfiguration(_serviceConfiguration)
                         .accelerate(_accelerate)
                         .disableMultiRegionAccessPoints(_disableMultiRegionAccessPoints)
-                        // .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
+                        .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
                         .forcePathStyle(_forcePathStyle)
                         .useArnRegion(_useArnRegion)
                         .crossRegionAccessEnabled(_crossRegionAccessEnabled)

diff --git a/src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java b/src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java
@@ -926,11 +926,11 @@ public Builder disableMultiRegionAccessPoints(Boolean disableMultiRegionAccessPo
          *
          * @param disableS3ExpressSessionAuth
          */
-        // @Override
-        // public Builder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
-        //     _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
-        //     return this;
-        // }
+        @Override
+        public Builder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
+            _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
+            return this;
+        }
 
         /**
          * Forces this client to use path-style addressing for buckets.
@@ -1077,7 +1077,7 @@ public S3EncryptionClient build() {
                         .useArnRegion(_useArnRegion)
                         .httpClient(_httpClient)
                         .httpClientBuilder(_httpClientBuilder)
-                        // .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
+                        .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
                         .crossRegionAccessEnabled(_crossRegionAccessEnabled)
                         .build();
             }
@@ -1097,7 +1097,7 @@ public S3EncryptionClient build() {
                         .useArnRegion(_useArnRegion)
                         .httpClient(_asyncHttpClient)
                         .httpClientBuilder(_asyncHttpClientBuilder)
-                        // .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
+                        .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
                         .crossRegionAccessEnabled(_crossRegionAccessEnabled)
                         // TODO: Add MPU stuff here too
                         .build();