Skip to content

Commit 3ae2ed5

Browse files
dagnirdagnir
committed
Merge remote-tracking branch 'public/master' into dongie/pr-revert
2 parents 0316a7a + 6d846bf commit 3ae2ed5

File tree

12 files changed

+13
-560
lines changed

12 files changed

+13
-560
lines changed

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.nio.ByteBuffer;
2323
import java.time.Duration;
2424
import java.util.Map;
25-
import java.util.Optional;
2625
import java.util.stream.Collectors;
2726
import software.amazon.awssdk.annotations.SdkProtectedApi;
2827
import software.amazon.awssdk.auth.credentials.AwsCredentials;
@@ -101,16 +100,6 @@ static <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
101100
.putAttribute(SdkInternalExecutionAttribute.DISABLE_HOST_PREFIX_INJECTION,
102101
clientConfig.option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION));
103102

104-
ExecutionAttributes clientOverrideExecutionAttributes = clientConfig.option(SdkClientOption.EXECUTION_ATTRIBUTES);
105-
if (clientOverrideExecutionAttributes != null) {
106-
executionAttributes = clientOverrideExecutionAttributes.merge(executionAttributes);
107-
}
108-
109-
Optional<? extends RequestOverrideConfiguration> requestOverrideConfiguration = originalRequest.overrideConfiguration();
110-
if (requestOverrideConfiguration.isPresent()) {
111-
executionAttributes = requestOverrideConfiguration.get().executionAttributes().merge(executionAttributes);
112-
}
113-
114103
ExecutionInterceptorChain executionInterceptorChain =
115104
new ExecutionInterceptorChain(clientConfig.option(SdkClientOption.EXECUTION_INTERCEPTORS));
116105
return ExecutionContext.builder()

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

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
import java.util.function.Consumer;
2828
import software.amazon.awssdk.annotations.Immutable;
2929
import software.amazon.awssdk.annotations.SdkPublicApi;
30-
import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
31-
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
32-
import software.amazon.awssdk.core.interceptor.UnmodifiableExecutionAttributes;
3330
import software.amazon.awssdk.core.signer.Signer;
3431
import software.amazon.awssdk.metrics.MetricPublisher;
3532
import software.amazon.awssdk.utils.CollectionUtils;
@@ -49,7 +46,6 @@ public abstract class RequestOverrideConfiguration {
4946
private final Duration apiCallAttemptTimeout;
5047
private final Signer signer;
5148
private final List<MetricPublisher> metricPublishers;
52-
private final ExecutionAttributes executionAttributes;
5349

5450
protected RequestOverrideConfiguration(Builder<?> builder) {
5551
this.headers = CollectionUtils.deepUnmodifiableMap(builder.headers(), () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
@@ -59,7 +55,6 @@ protected RequestOverrideConfiguration(Builder<?> builder) {
5955
this.apiCallAttemptTimeout = Validate.isPositiveOrNull(builder.apiCallAttemptTimeout(), "apiCallAttemptTimeout");
6056
this.signer = builder.signer();
6157
this.metricPublishers = Collections.unmodifiableList(new ArrayList<>(builder.metricPublishers()));
62-
this.executionAttributes = new UnmodifiableExecutionAttributes(builder.executionAttributes());
6358
}
6459

6560
/**
@@ -143,16 +138,6 @@ public List<MetricPublisher> metricPublishers() {
143138
return metricPublishers;
144139
}
145140

146-
/**
147-
* Returns the additional execution attributes to be added to this request.
148-
* This collection of attributes is added in addition to the attributes set on the client.
149-
* An attribute value added on the client within the collection of attributes is superseded by an
150-
* attribute value added on the request.
151-
*/
152-
public ExecutionAttributes executionAttributes() {
153-
return executionAttributes;
154-
}
155-
156141
@Override
157142
public boolean equals(Object o) {
158143
if (this == o) {
@@ -168,8 +153,7 @@ public boolean equals(Object o) {
168153
Objects.equals(apiCallTimeout, that.apiCallTimeout) &&
169154
Objects.equals(apiCallAttemptTimeout, that.apiCallAttemptTimeout) &&
170155
Objects.equals(signer, that.signer) &&
171-
Objects.equals(metricPublishers, that.metricPublishers) &&
172-
Objects.equals(executionAttributes, that.executionAttributes);
156+
Objects.equals(metricPublishers, that.metricPublishers);
173157
}
174158

175159
@Override
@@ -182,7 +166,6 @@ public int hashCode() {
182166
hashCode = 31 * hashCode + Objects.hashCode(apiCallAttemptTimeout);
183167
hashCode = 31 * hashCode + Objects.hashCode(signer);
184168
hashCode = 31 * hashCode + Objects.hashCode(metricPublishers);
185-
hashCode = 31 * hashCode + Objects.hashCode(executionAttributes);
186169
return hashCode;
187170
}
188171

@@ -388,22 +371,6 @@ default B putRawQueryParameter(String name, String value) {
388371

389372
List<MetricPublisher> metricPublishers();
390373

391-
/**
392-
* Sets the additional execution attributes collection for this request.
393-
* @param executionAttributes Execution attributes map for this request
394-
* @return This object for method chaining.
395-
*/
396-
B executionAttributes(Map<ExecutionAttribute<?>, ?> executionAttributes);
397-
398-
/**
399-
* Add an execution attribute to the existing collection of execution attributes.
400-
* @param attribute The execution attribute object
401-
* @param value The value of the execution attribute.
402-
*/
403-
<T> B putExecutionAttribute(ExecutionAttribute<T> attribute, T value);
404-
405-
ExecutionAttributes executionAttributes();
406-
407374
/**
408375
* Create a new {@code SdkRequestOverrideConfiguration} with the properties set on this builder.
409376
*
@@ -420,7 +387,6 @@ protected abstract static class BuilderImpl<B extends Builder> implements Builde
420387
private Duration apiCallAttemptTimeout;
421388
private Signer signer;
422389
private List<MetricPublisher> metricPublishers = new ArrayList<>();
423-
private ExecutionAttributes.Builder executionAttributes = ExecutionAttributes.builder();
424390

425391
protected BuilderImpl() {
426392
}
@@ -560,27 +526,5 @@ public void setMetricPublishers(List<MetricPublisher> metricPublishers) {
560526
public List<MetricPublisher> metricPublishers() {
561527
return metricPublishers;
562528
}
563-
564-
@Override
565-
public B executionAttributes(Map<ExecutionAttribute<?>, ?> executionAttributes) {
566-
Validate.paramNotNull(executionAttributes, "executionAttributes");
567-
this.executionAttributes = ExecutionAttributes.builder().putAll(executionAttributes);
568-
return (B) this;
569-
}
570-
571-
@Override
572-
public <T> B putExecutionAttribute(ExecutionAttribute<T> executionAttribute, T value) {
573-
this.executionAttributes.put(executionAttribute, value);
574-
return (B) this;
575-
}
576-
577-
@Override
578-
public ExecutionAttributes executionAttributes() {
579-
return executionAttributes.build();
580-
}
581-
582-
public void setExecutionAttributes(Map<ExecutionAttribute<?>, Object> executionAttributes) {
583-
executionAttributes(executionAttributes);
584-
}
585529
}
586530
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
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;
@@ -371,7 +370,6 @@ public final B overrideConfiguration(ClientOverrideConfiguration overrideConfig)
371370
clientConfiguration.option(PROFILE_FILE, overrideConfig.defaultProfileFile().orElse(null));
372371
clientConfiguration.option(PROFILE_NAME, overrideConfig.defaultProfileName().orElse(null));
373372
clientConfiguration.option(METRIC_PUBLISHERS, overrideConfig.metricPublishers());
374-
clientConfiguration.option(EXECUTION_ATTRIBUTES, overrideConfig.executionAttributes());
375373
overrideConfig.advancedOption(ENDPOINT_OVERRIDDEN_OVERRIDE).ifPresent(value -> {
376374
clientConfiguration.option(ENDPOINT_OVERRIDDEN, value);
377375
});

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

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
import java.util.TreeMap;
2626
import java.util.function.Consumer;
2727
import software.amazon.awssdk.annotations.SdkPublicApi;
28-
import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
29-
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
3028
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
31-
import software.amazon.awssdk.core.interceptor.UnmodifiableExecutionAttributes;
3229
import software.amazon.awssdk.core.retry.RetryMode;
3330
import software.amazon.awssdk.core.retry.RetryPolicy;
3431
import software.amazon.awssdk.core.sync.ResponseTransformer;
@@ -60,7 +57,6 @@ public final class ClientOverrideConfiguration
6057
private final ProfileFile defaultProfileFile;
6158
private final String defaultProfileName;
6259
private final List<MetricPublisher> metricPublishers;
63-
private final ExecutionAttributes executionAttributes;
6460

6561
/**
6662
* Initialize this configuration. Private to require use of {@link #builder()}.
@@ -75,7 +71,6 @@ private ClientOverrideConfiguration(Builder builder) {
7571
this.defaultProfileFile = builder.defaultProfileFile();
7672
this.defaultProfileName = builder.defaultProfileName();
7773
this.metricPublishers = Collections.unmodifiableList(new ArrayList<>(builder.metricPublishers()));
78-
this.executionAttributes = new UnmodifiableExecutionAttributes(builder.executionAttributes());
7974
}
8075

8176
@Override
@@ -87,8 +82,7 @@ public Builder toBuilder() {
8782
.apiCallAttemptTimeout(apiCallAttemptTimeout)
8883
.executionInterceptors(executionInterceptors)
8984
.defaultProfileFile(defaultProfileFile)
90-
.defaultProfileName(defaultProfileName)
91-
.executionAttributes(executionAttributes.getAttributes());
85+
.defaultProfileName(defaultProfileName);
9286
}
9387

9488
/**
@@ -202,15 +196,6 @@ public List<MetricPublisher> metricPublishers() {
202196
return metricPublishers;
203197
}
204198

205-
/**
206-
* Returns the additional execution attributes to be added for this client.
207-
*
208-
* @Return Map of execution attributes.
209-
*/
210-
public ExecutionAttributes executionAttributes() {
211-
return executionAttributes;
212-
}
213-
214199
@Override
215200
public String toString() {
216201
return ToString.builder("ClientOverrideConfiguration")
@@ -454,22 +439,6 @@ default Builder retryPolicy(RetryMode retryMode) {
454439
Builder addMetricPublisher(MetricPublisher metricPublisher);
455440

456441
List<MetricPublisher> metricPublishers();
457-
458-
/**
459-
* Sets the additional execution attributes collection for this client.
460-
* @param executionAttributes Execution attributes map for this client.
461-
* @return This object for method chaining.
462-
*/
463-
Builder executionAttributes(Map<ExecutionAttribute<?>, ?> executionAttributes);
464-
465-
/**
466-
* Put an execution attribute into to the existing collection of execution attributes.
467-
* @param attribute The execution attribute object
468-
* @param value The value of the execution attribute.
469-
*/
470-
<T> Builder putExecutionAttribute(ExecutionAttribute<T> attribute, T value);
471-
472-
ExecutionAttributes executionAttributes();
473442
}
474443

475444
/**
@@ -485,7 +454,6 @@ private static final class DefaultClientOverrideConfigurationBuilder implements
485454
private ProfileFile defaultProfileFile;
486455
private String defaultProfileName;
487456
private List<MetricPublisher> metricPublishers = new ArrayList<>();
488-
private ExecutionAttributes.Builder executionAttributes = ExecutionAttributes.builder();
489457

490458
@Override
491459
public Builder headers(Map<String, List<String>> headers) {
@@ -650,24 +618,6 @@ public List<MetricPublisher> metricPublishers() {
650618
return Collections.unmodifiableList(metricPublishers);
651619
}
652620

653-
@Override
654-
public Builder executionAttributes(Map<ExecutionAttribute<?>, ?> executionAttributes) {
655-
Validate.paramNotNull(executionAttributes, "executionAttributes");
656-
this.executionAttributes = ExecutionAttributes.builder().putAll(executionAttributes);
657-
return this;
658-
}
659-
660-
@Override
661-
public <T> Builder putExecutionAttribute(ExecutionAttribute<T> executionAttribute, T value) {
662-
this.executionAttributes.put(executionAttribute, value);
663-
return this;
664-
}
665-
666-
@Override
667-
public ExecutionAttributes executionAttributes() {
668-
return executionAttributes.build();
669-
}
670-
671621
@Override
672622
public ClientOverrideConfiguration build() {
673623
return new ClientOverrideConfiguration(this);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import software.amazon.awssdk.annotations.SdkProtectedApi;
2424
import software.amazon.awssdk.core.ClientType;
2525
import software.amazon.awssdk.core.ServiceConfiguration;
26-
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
2726
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
2827
import software.amazon.awssdk.core.retry.RetryPolicy;
2928
import software.amazon.awssdk.http.SdkHttpClient;
@@ -139,12 +138,6 @@ public final class SdkClientOption<T> extends ClientOption<T> {
139138
*/
140139
public static final SdkClientOption<Boolean> SIGNER_OVERRIDDEN = new SdkClientOption<>(Boolean.class);
141140

142-
/**
143-
* Option to specify additional execution attributes to each client call.
144-
*/
145-
public static final SdkClientOption<ExecutionAttributes> EXECUTION_ATTRIBUTES =
146-
new SdkClientOption<>(new UnsafeValueType(ExecutionAttributes.class));
147-
148141
private SdkClientOption(Class<T> valueClass) {
149142
super(valueClass);
150143
}

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package software.amazon.awssdk.core.interceptor;
1717

18-
import java.util.Objects;
1918
import software.amazon.awssdk.annotations.SdkPublicApi;
2019

2120
/**
@@ -58,32 +57,4 @@ public ExecutionAttribute(String name) {
5857
public String toString() {
5958
return name;
6059
}
61-
62-
/**
63-
* This override considers execution attributes with the same name
64-
* to be the same object for the purpose of attribute merge.
65-
* @return boolean indicating whether the objects are equal or not.
66-
*/
67-
@Override
68-
public boolean equals(Object o) {
69-
if (this == o) {
70-
return true;
71-
}
72-
if (o == null || getClass() != o.getClass()) {
73-
return false;
74-
}
75-
76-
ExecutionAttribute that = (ExecutionAttribute) o;
77-
return that.name.equals(this.name);
78-
}
79-
80-
/**
81-
* This override considers execution attributes with the same name
82-
* to be the same object for the purpose of attribute merge.
83-
* @return hash code
84-
*/
85-
@Override
86-
public int hashCode() {
87-
return Objects.hashCode(name);
88-
}
8960
}

0 commit comments

Comments
 (0)