From 814ea9d17ea77b1cf1a945943280241ceddae023 Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Fri, 21 Jun 2024 09:58:26 -0700 Subject: [PATCH] non-required for now --- crt/aws-c-s3 | 2 +- src/main/java/software/amazon/awssdk/crt/s3/S3Client.java | 7 ------- .../amazon/awssdk/crt/s3/S3MetaRequestOptions.java | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index b93e534de..6588f9a71 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit b93e534de5f4aba9675126c4c0fb1f9b097401cd +Subproject commit 6588f9a714ee7a8be1bddd63ea5ea1ea224d00b4 diff --git a/src/main/java/software/amazon/awssdk/crt/s3/S3Client.java b/src/main/java/software/amazon/awssdk/crt/s3/S3Client.java index f7cca31c2..6b49bb53a 100644 --- a/src/main/java/software/amazon/awssdk/crt/s3/S3Client.java +++ b/src/main/java/software/amazon/awssdk/crt/s3/S3Client.java @@ -141,13 +141,6 @@ public S3MetaRequest makeMetaRequest(S3MetaRequestOptions options) { throw new IllegalArgumentException("S3Client.makeMetaRequest has invalid options; Response Handler cannot be null."); } - String operationName = options.getOperationName(); - if (options.getMetaRequestType() == S3MetaRequestOptions.MetaRequestType.DEFAULT && operationName == null) { - Log.log(Log.LogLevel.Error, Log.LogSubject.S3Client, - "S3Client.makeMetaRequest has invalid options; Operation name must be set for MetaRequestType.DEFAULT."); - throw new IllegalArgumentException("S3Client.makeMetaRequest has invalid options; Operation name must be set for MetaRequestType.DEFAULT."); - } - S3MetaRequest metaRequest = new S3MetaRequest(); S3MetaRequestResponseHandlerNativeAdapter responseHandlerNativeAdapter = new S3MetaRequestResponseHandlerNativeAdapter( options.getResponseHandler()); diff --git a/src/main/java/software/amazon/awssdk/crt/s3/S3MetaRequestOptions.java b/src/main/java/software/amazon/awssdk/crt/s3/S3MetaRequestOptions.java index 7c3466adb..9ce0a4db3 100644 --- a/src/main/java/software/amazon/awssdk/crt/s3/S3MetaRequestOptions.java +++ b/src/main/java/software/amazon/awssdk/crt/s3/S3MetaRequestOptions.java @@ -102,8 +102,8 @@ public MetaRequestType getMetaRequestType() { /** * The S3 operation name (eg: "CreateBucket"), - * this MUST be set for {@link MetaRequestType#DEFAULT}, - * it is not necessary for other meta request types. + * this should be set for {@link MetaRequestType#DEFAULT}, + * it is ignored for other meta request types since the operation is implicit. * * See * S3 API documentation for the canonical list of names.