Skip to content

Commit ba69df6

Browse files
davidh44davidh44
committed
Remove unnecessary ExecutionAttribute
1 parent a78943f commit ba69df6

File tree

13 files changed

+26
-57
lines changed

13 files changed

+26
-57
lines changed

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/traits/RequestCompressionTrait.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import java.util.stream.Collectors;
2121
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2222
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
23-
import software.amazon.awssdk.core.client.config.SdkClientOption;
2423
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
25-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
2624
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
2725
import software.amazon.awssdk.core.internal.interceptor.trait.RequestCompression;
2826

@@ -63,9 +61,6 @@ public static CodeBlock create(OperationModel operationModel, IntermediateModel
6361
SdkInternalExecutionAttribute.class, RequestCompression.class,
6462
encodings.stream().collect(Collectors.joining("\", \"", "\"", "\"")),
6563
operationModel.hasStreamingInput()))
66-
.add(CodeBlock.of(".putExecutionAttribute($T.REQUEST_COMPRESSION_CONFIGURATION,"
67-
+ "clientConfiguration.option($T.REQUEST_COMPRESSION_CONFIGURATION))",
68-
SdkExecutionAttribute.class, SdkClientOption.class))
6964
.build();
7065
}
7166
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import software.amazon.awssdk.core.client.handler.AttachHttpMetadataResponseHandler;
3838
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
3939
import software.amazon.awssdk.core.http.HttpResponseHandler;
40-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
4140
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
4241
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
4342
import software.amazon.awssdk.core.internal.interceptor.trait.RequestCompression;
@@ -732,8 +731,6 @@ public CompletableFuture<OperationWithRequestCompressionResponse> operationWithR
732731
.withMetricCollector(apiCallMetricCollector)
733732
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
734733
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
735-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
736-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
737734
.withInput(operationWithRequestCompressionRequest));
738735
CompletableFuture<OperationWithRequestCompressionResponse> whenCompleted = executeFuture.whenComplete((r, e) -> {
739736
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import software.amazon.awssdk.core.client.handler.AttachHttpMetadataResponseHandler;
4141
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
4242
import software.amazon.awssdk.core.http.HttpResponseHandler;
43-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
4443
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
4544
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
4645
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
@@ -810,8 +809,6 @@ public CompletableFuture<OperationWithRequestCompressionResponse> operationWithR
810809
.withMetricCollector(apiCallMetricCollector)
811810
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
812811
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
813-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
814-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
815812
.withInput(operationWithRequestCompressionRequest));
816813
CompletableFuture<OperationWithRequestCompressionResponse> whenCompleted = executeFuture.whenComplete((r, e) -> {
817814
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
1919
import software.amazon.awssdk.core.exception.SdkClientException;
2020
import software.amazon.awssdk.core.http.HttpResponseHandler;
21-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
2221
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
2322
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
2423
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
@@ -458,8 +457,6 @@ public OperationWithRequestCompressionResponse operationWithRequestCompression(
458457
.withMetricCollector(apiCallMetricCollector)
459458
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
460459
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
461-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
462-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
463460
.withMarshaller(new OperationWithRequestCompressionRequestMarshaller(protocolFactory)));
464461
} finally {
465462
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
2727
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
2828
import software.amazon.awssdk.core.http.HttpResponseHandler;
29-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
3029
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
3130
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
3231
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
@@ -544,8 +543,6 @@ public CompletableFuture<OperationWithRequestCompressionResponse> operationWithR
544543
.withMetricCollector(apiCallMetricCollector)
545544
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
546545
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
547-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
548-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
549546
.withInput(operationWithRequestCompressionRequest));
550547
CompletableFuture<OperationWithRequestCompressionResponse> whenCompleteFuture = null;
551548
whenCompleteFuture = executeFuture.whenComplete((r, e) -> {

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
1818
import software.amazon.awssdk.core.exception.SdkClientException;
1919
import software.amazon.awssdk.core.http.HttpResponseHandler;
20-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
2120
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
2221
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
2322
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
@@ -469,8 +468,6 @@ public OperationWithRequestCompressionResponse operationWithRequestCompression(
469468
.withMetricCollector(apiCallMetricCollector)
470469
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
471470
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
472-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
473-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
474471
.withMarshaller(new OperationWithRequestCompressionRequestMarshaller(protocolFactory)));
475472
} finally {
476473
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
3333
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
3434
import software.amazon.awssdk.core.http.HttpResponseHandler;
35-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
3635
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
3736
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
3837
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
@@ -567,8 +566,6 @@ public CompletableFuture<OperationWithRequestCompressionResponse> operationWithR
567566
.withMetricCollector(apiCallMetricCollector)
568567
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
569568
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
570-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
571-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
572569
.withInput(operationWithRequestCompressionRequest));
573570
CompletableFuture<OperationWithRequestCompressionResponse> whenCompleteFuture = null;
574571
whenCompleteFuture = executeFuture.whenComplete((r, e) -> {

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-client-class.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
1919
import software.amazon.awssdk.core.exception.SdkClientException;
2020
import software.amazon.awssdk.core.http.HttpResponseHandler;
21-
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
2221
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
2322
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
2423
import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
@@ -406,8 +405,6 @@ public OperationWithRequestCompressionResponse operationWithRequestCompression(
406405
.withInput(operationWithRequestCompressionRequest)
407406
.putExecutionAttribute(SdkInternalExecutionAttribute.REQUEST_COMPRESSION,
408407
RequestCompression.builder().encodings("gzip").isStreaming(false).build())
409-
.putExecutionAttribute(SdkExecutionAttribute.REQUEST_COMPRESSION_CONFIGURATION,
410-
clientConfiguration.option(SdkClientOption.REQUEST_COMPRESSION_CONFIGURATION))
411408
.withMarshaller(new OperationWithRequestCompressionRequestMarshaller(protocolFactory)));
412409
} finally {
413410
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));

‎core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkExecutionAttribute.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.function.Supplier;
2020
import software.amazon.awssdk.annotations.SdkPublicApi;
2121
import software.amazon.awssdk.core.ClientType;
22-
import software.amazon.awssdk.core.RequestCompressionConfiguration;
2322
import software.amazon.awssdk.core.ServiceConfiguration;
2423
import software.amazon.awssdk.core.checksums.Algorithm;
2524
import software.amazon.awssdk.core.checksums.ChecksumSpecs;
@@ -110,13 +109,6 @@ public class SdkExecutionAttribute {
110109
public static final ExecutionAttribute<ChecksumValidation> HTTP_RESPONSE_CHECKSUM_VALIDATION = new ExecutionAttribute<>(
111110
"HttpResponseChecksumValidation");
112111

113-
/**
114-
* The {@link RequestCompressionConfiguration}, which includes options to enable/disable request compression and set the
115-
* minimum compression threshold.
116-
*/
117-
public static final ExecutionAttribute<RequestCompressionConfiguration> REQUEST_COMPRESSION_CONFIGURATION =
118-
new ExecutionAttribute<>("RequestCompressionConfiguration");
119-
120112
protected SdkExecutionAttribute() {
121113
}
122114
}

‎core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonAsyncHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public <OutputT> CompletableFuture<OutputT> execute(
172172
.then(ApplyUserAgentStage::new)
173173
.then(MergeCustomHeadersStage::new)
174174
.then(MergeCustomQueryParamsStage::new)
175-
.then(CompressRequestStage::new)
175+
.then(() -> new CompressRequestStage(httpClientDependencies))
176176
.then(() -> new HttpChecksumStage(ClientType.ASYNC))
177177
.then(MakeRequestImmutableStage::new)
178178
.then(RequestPipelineBuilder

‎core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonSyncHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public <OutputT> OutputT execute(HttpResponseHandler<Response<OutputT>> response
173173
.then(ApplyUserAgentStage::new)
174174
.then(MergeCustomHeadersStage::new)
175175
.then(MergeCustomQueryParamsStage::new)
176-
.then(CompressRequestStage::new)
176+
.then(() -> new CompressRequestStage(httpClientDependencies))
177177
.then(() -> new HttpChecksumStage(ClientType.SYNC))
178178
.then(MakeRequestImmutableStage::new)
179179
// End of mutating request

0 commit comments

Comments
 (0)