Skip to content

Commit 988b457

Browse files
committed
Revert "Fix checkstyle"
This reverts commit 8067393.
1 parent 6304f63 commit 988b457

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ public List<MetricPublisher> metricPublishers() {
147147
* An attribute value added on the client within the collection of attributes is superseded by an
148148
* attribute value added on the request.
149149
*/
150-
public Map<ExecutionAttribute<?>, Object> executionAttributes() {
151-
return executionAttributes;
152-
}
150+
public Map<ExecutionAttribute<?>, Object> executionAttributes() { return executionAttributes; }
153151

154152
@Override
155153
public boolean equals(Object o) {
@@ -375,7 +373,7 @@ default B putRawQueryParameter(String name, String value) {
375373
B metricPublishers(List<MetricPublisher> metricPublisher);
376374

377375
/**
378-
* Add a metric publisher to the existing list of prereported by Checkstyle 8.38 with software/amazon/awssdk/checkstyle.xml ruleset. -> [Help 1]viously set publishers to be used for publishing metrics
376+
* Add a metric publisher to the existing list of previously set publishers to be used for publishing metrics
379377
* for this request.
380378
*
381379
* @param metricPublisher The metric publisher to add.
@@ -571,12 +569,8 @@ public B addExecutionAttribute(ExecutionAttribute executionAttribute, Object val
571569
}
572570

573571
@Override
574-
public Map<ExecutionAttribute<?>, Object> executionAttributes() {
575-
return executionAttributes;
576-
}
572+
public Map<ExecutionAttribute<?>, Object> executionAttributes() { return executionAttributes; }
577573

578-
public void setExecutionAttributes(Map<ExecutionAttribute<?>, Object> executionAttributes) {
579-
executionAttributes(executionAttributes);
580-
}
574+
public void setExecutionAttributes(Map<ExecutionAttribute<?>, Object> executionAttributes) { executionAttributes(executionAttributes); }
581575
}
582576
}

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import static software.amazon.awssdk.core.client.config.SdkClientOption.ASYNC_HTTP_CLIENT;
2929
import static software.amazon.awssdk.core.client.config.SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED;
3030
import static software.amazon.awssdk.core.client.config.SdkClientOption.ENDPOINT_OVERRIDDEN;
31-
import static software.amazon.awssdk.core.client.config.SdkClientOption.EXECUTION_ATTRIBUTES;
3231
import static software.amazon.awssdk.core.client.config.SdkClientOption.EXECUTION_INTERCEPTORS;
3332
import static software.amazon.awssdk.core.client.config.SdkClientOption.METRIC_PUBLISHERS;
3433
import static software.amazon.awssdk.core.client.config.SdkClientOption.PROFILE_FILE;
3534
import static software.amazon.awssdk.core.client.config.SdkClientOption.PROFILE_NAME;
3635
import static software.amazon.awssdk.core.client.config.SdkClientOption.RETRY_POLICY;
3736
import static software.amazon.awssdk.core.client.config.SdkClientOption.SCHEDULED_EXECUTOR_SERVICE;
3837
import static software.amazon.awssdk.core.client.config.SdkClientOption.SIGNER_OVERRIDDEN;
38+
import static software.amazon.awssdk.core.client.config.SdkClientOption.EXECUTION_ATTRIBUTES;
3939
import static software.amazon.awssdk.core.internal.SdkInternalTestAdvancedClientOption.ENDPOINT_OVERRIDDEN_OVERRIDE;
4040
import static software.amazon.awssdk.utils.CollectionUtils.mergeLists;
4141
import static software.amazon.awssdk.utils.Validate.paramNotNull;

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,7 @@ public List<MetricPublisher> metricPublishers() {
204204
*
205205
* @Return Map of execution attributes.
206206
*/
207-
public Map<ExecutionAttribute<?>, Object> executionAttributes() {
208-
return executionAttributes;
209-
}
207+
public Map<ExecutionAttribute<?>, Object> executionAttributes() { return executionAttributes; }
210208

211209
@Override
212210
public String toString() {
@@ -661,9 +659,7 @@ public Builder addExecutionAttribute(ExecutionAttribute executionAttribute, Obje
661659
}
662660

663661
@Override
664-
public Map<ExecutionAttribute<?>, Object> executionAttributes() {
665-
return executionAttributes;
666-
}
662+
public Map<ExecutionAttribute<?>, Object> executionAttributes() { return executionAttributes; }
667663

668664
@Override
669665
public ClientOverrideConfiguration build() {

0 commit comments

Comments
 (0)