Skip to content

Commit fc5efe8

Browse files
millemsmillems
committed
Renamed RequestOverrideConfig to RequestOverrideConfiguration to match ClientOverrideConfiguration naming.
1 parent 6b189c3 commit fc5efe8

File tree

30 files changed

+179
-177
lines changed

30 files changed

+179
-177
lines changed

‎.changes/next-release/feature-AWSSDKforJavav2-08fe954.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"type": "feature",
4+
"description": "Renamed `RequestOverrideConfig` to `RequestOverrideConfiguration` to match `ClientOverrideConfiguration` naming."
5+
}

‎auth/src/test/java/software/amazon/awssdk/auth/credentials/NoopTestRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
import java.util.Optional;
1919
import software.amazon.awssdk.core.SdkRequest;
20-
import software.amazon.awssdk.core.RequestOverrideConfig;
20+
import software.amazon.awssdk.core.RequestOverrideConfiguration;
2121

2222
public class NoopTestRequest extends SdkRequest {
2323
private NoopTestRequest() {
2424

2525
}
2626

2727
@Override
28-
public Optional<? extends RequestOverrideConfig> requestOverrideConfig() {
28+
public Optional<? extends RequestOverrideConfiguration> overrideConfiguration() {
2929
return Optional.empty();
3030
}
3131

@@ -46,7 +46,7 @@ public interface Builder extends SdkRequest.Builder {
4646
private static class BuilderImpl implements SdkRequest.Builder, Builder {
4747

4848
@Override
49-
public RequestOverrideConfig requestOverrideConfig() {
49+
public RequestOverrideConfiguration overrideConfiguration() {
5050
return null;
5151
}
5252

‎aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequest.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
* Base class for all AWS Service requests.
2424
*/
2525
public abstract class AwsRequest extends SdkRequest {
26-
private final AwsRequestOverrideConfig requestOverrideConfig;
26+
private final AwsRequestOverrideConfiguration requestOverrideConfig;
2727

2828
protected AwsRequest(Builder builder) {
29-
this.requestOverrideConfig = builder.requestOverrideConfig();
29+
this.requestOverrideConfig = builder.overrideConfiguration();
3030
}
3131

3232
@Override
33-
public final Optional<AwsRequestOverrideConfig> requestOverrideConfig() {
33+
public final Optional<AwsRequestOverrideConfiguration> overrideConfiguration() {
3434
return Optional.ofNullable(requestOverrideConfig);
3535
}
3636

@@ -39,55 +39,56 @@ public final Optional<AwsRequestOverrideConfig> requestOverrideConfig() {
3939

4040
public interface Builder extends SdkRequest.Builder {
4141
@Override
42-
AwsRequestOverrideConfig requestOverrideConfig();
42+
AwsRequestOverrideConfiguration overrideConfiguration();
4343

4444
/**
4545
* Add an optional request override configuration.
4646
*
4747
* @param awsRequestOverrideConfig The override configuration.
4848
* @return This object for method chaining.
4949
*/
50-
Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig);
50+
Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig);
5151

5252

5353
/**
5454
* Add an optional request override configuration.
5555
*
56-
* @param builderConsumer A {@link Consumer} to which an empty {@link AwsRequestOverrideConfig.Builder} will be given.
56+
* @param builderConsumer A {@link Consumer} to which an empty {@link AwsRequestOverrideConfiguration.Builder} will be
57+
* given.
5758
* @return This object for method chaining.
5859
*/
59-
Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer);
60+
Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
6061

6162
@Override
6263
AwsRequest build();
6364
}
6465

6566
protected abstract static class BuilderImpl implements Builder {
66-
private AwsRequestOverrideConfig awsRequestOverrideConfig;
67+
private AwsRequestOverrideConfiguration awsRequestOverrideConfig;
6768

6869
protected BuilderImpl() {
6970
}
7071

7172
protected BuilderImpl(AwsRequest request) {
72-
request.requestOverrideConfig().ifPresent(this::requestOverrideConfig);
73+
request.overrideConfiguration().ifPresent(this::overrideConfiguration);
7374
}
7475

7576
@Override
76-
public Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig) {
77+
public Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig) {
7778
this.awsRequestOverrideConfig = awsRequestOverrideConfig;
7879
return this;
7980
}
8081

8182
@Override
82-
public Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer) {
83-
AwsRequestOverrideConfig.Builder b = AwsRequestOverrideConfig.builder();
83+
public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
84+
AwsRequestOverrideConfiguration.Builder b = AwsRequestOverrideConfiguration.builder();
8485
builderConsumer.accept(b);
8586
awsRequestOverrideConfig = b.build();
8687
return this;
8788
}
8889

8990
@Override
90-
public final AwsRequestOverrideConfig requestOverrideConfig() {
91+
public final AwsRequestOverrideConfiguration overrideConfiguration() {
9192
return awsRequestOverrideConfig;
9293
}
9394
}

‎aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfig.java renamed to ‎aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfiguration.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import java.util.Optional;
1919

2020
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
21-
import software.amazon.awssdk.core.RequestOverrideConfig;
21+
import software.amazon.awssdk.core.RequestOverrideConfiguration;
2222

2323
/**
2424
* Request-specific configuration overrides for AWS service clients.
2525
*/
26-
public final class AwsRequestOverrideConfig extends RequestOverrideConfig {
26+
public final class AwsRequestOverrideConfiguration extends RequestOverrideConfiguration {
2727
private final AwsCredentialsProvider credentialsProvider;
2828

29-
private AwsRequestOverrideConfig(Builder builder) {
29+
private AwsRequestOverrideConfiguration(Builder builder) {
3030
super(builder);
3131
this.credentialsProvider = builder.credentialsProvider();
3232
}
@@ -49,7 +49,7 @@ public static Builder builder() {
4949
return new BuilderImpl();
5050
}
5151

52-
public interface Builder extends RequestOverrideConfig.Builder<Builder> {
52+
public interface Builder extends RequestOverrideConfiguration.Builder<Builder> {
5353
/**
5454
* Set the optional {@link AwsCredentialsProvider} that will provide credentials to be used to authenticate this request.
5555
*
@@ -67,18 +67,18 @@ public interface Builder extends RequestOverrideConfig.Builder<Builder> {
6767
AwsCredentialsProvider credentialsProvider();
6868

6969
@Override
70-
AwsRequestOverrideConfig build();
70+
AwsRequestOverrideConfiguration build();
7171
}
7272

73-
private static final class BuilderImpl extends RequestOverrideConfig.BuilderImpl<Builder> implements Builder {
73+
private static final class BuilderImpl extends RequestOverrideConfiguration.BuilderImpl<Builder> implements Builder {
7474

7575
private AwsCredentialsProvider awsCredentialsProvider;
7676

7777

7878
private BuilderImpl() {
7979
}
8080

81-
private BuilderImpl(AwsRequestOverrideConfig awsRequestOverrideConfig) {
81+
private BuilderImpl(AwsRequestOverrideConfiguration awsRequestOverrideConfig) {
8282
super(awsRequestOverrideConfig);
8383
this.awsCredentialsProvider = awsRequestOverrideConfig.credentialsProvider;
8484
}
@@ -95,8 +95,8 @@ public AwsCredentialsProvider credentialsProvider() {
9595
}
9696

9797
@Override
98-
public AwsRequestOverrideConfig build() {
99-
return new AwsRequestOverrideConfig(this);
98+
public AwsRequestOverrideConfiguration build() {
99+
return new AwsRequestOverrideConfiguration(this);
100100
}
101101
}
102102
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import software.amazon.awssdk.auth.AwsExecutionAttributes;
2020
import software.amazon.awssdk.auth.credentials.AwsCredentials;
2121
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
22-
import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
22+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
2323
import software.amazon.awssdk.awscore.config.AwsAdvancedClientOption;
2424
import software.amazon.awssdk.awscore.config.AwsClientConfiguration;
25-
import software.amazon.awssdk.core.RequestOverrideConfig;
25+
import software.amazon.awssdk.core.RequestOverrideConfiguration;
2626
import software.amazon.awssdk.core.SdkRequest;
2727
import software.amazon.awssdk.core.ServiceConfiguration;
2828
import software.amazon.awssdk.core.config.ClientOverrideConfiguration;
@@ -43,10 +43,10 @@ static ExecutionContext createExecutionContext(SdkRequest originalRequest,
4343
AwsClientConfiguration clientConfiguration,
4444
ServiceConfiguration serviceConfiguration) {
4545

46-
AwsCredentialsProvider credentialsProvider = originalRequest.requestOverrideConfig()
47-
.filter(c -> c instanceof AwsRequestOverrideConfig)
48-
.map(c -> (AwsRequestOverrideConfig) c)
49-
.flatMap(AwsRequestOverrideConfig::credentialsProvider)
46+
AwsCredentialsProvider credentialsProvider = originalRequest.overrideConfiguration()
47+
.filter(c -> c instanceof AwsRequestOverrideConfiguration)
48+
.map(c -> (AwsRequestOverrideConfiguration) c)
49+
.flatMap(AwsRequestOverrideConfiguration::credentialsProvider)
5050
.orElse(clientConfiguration.credentialsProvider());
5151

5252
ClientOverrideConfiguration overrideConfiguration = clientConfiguration.overrideConfiguration();
@@ -58,10 +58,10 @@ static ExecutionContext createExecutionContext(SdkRequest originalRequest,
5858
ExecutionAttributes executionAttributes = new ExecutionAttributes()
5959
.putAttribute(AwsExecutionAttributes.SERVICE_CONFIG, serviceConfiguration)
6060
.putAttribute(AwsExecutionAttributes.AWS_CREDENTIALS, credentials)
61-
.putAttribute(AwsExecutionAttributes.REQUEST_CONFIG, originalRequest.requestOverrideConfig()
62-
.map(c -> (RequestOverrideConfig) c)
63-
.orElse(AwsRequestOverrideConfig.builder()
64-
.build()))
61+
.putAttribute(AwsExecutionAttributes.REQUEST_CONFIG, originalRequest.overrideConfiguration()
62+
.map(c -> (RequestOverrideConfiguration) c)
63+
.orElse(AwsRequestOverrideConfiguration.builder()
64+
.build()))
6565
.putAttribute(AwsExecutionAttributes.AWS_REGION,
6666
overrideConfiguration.advancedOption(AwsAdvancedClientOption.AWS_REGION));
6767

‎aws-core/src/test/java/software/amazon/awssdk/awscore/client/http/NoopTestAwsRequest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package software.amazon.awssdk.awscore.client.http;
1717

1818
import software.amazon.awssdk.awscore.AwsRequest;
19-
import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
19+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
2020

2121
public class NoopTestAwsRequest extends AwsRequest {
2222
private NoopTestAwsRequest(Builder builder) {
@@ -37,7 +37,7 @@ public interface Builder extends AwsRequest.Builder {
3737
NoopTestAwsRequest build();
3838

3939
@Override
40-
Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig);
40+
Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig);
4141
}
4242

4343
private static class BuilderImpl extends AwsRequest.BuilderImpl implements Builder {
@@ -48,8 +48,8 @@ public NoopTestAwsRequest build() {
4848
}
4949

5050
@Override
51-
public Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig) {
52-
super.requestOverrideConfig(awsRequestOverrideConfig);
51+
public Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig) {
52+
super.overrideConfiguration(awsRequestOverrideConfig);
5353
return this;
5454
}
5555
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.List;
2626
import java.util.function.Consumer;
2727
import javax.lang.model.element.Modifier;
28-
import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
28+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
2929
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3030
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
3131
import software.amazon.awssdk.codegen.model.intermediate.ShapeType;
@@ -82,17 +82,17 @@ public TypeSpec builderInterface() {
8282
}
8383

8484
if (isRequest()) {
85-
builder.addMethod(MethodSpec.methodBuilder("requestOverrideConfig")
85+
builder.addMethod(MethodSpec.methodBuilder("overrideConfiguration")
8686
.returns(builderInterfaceName())
8787
.addAnnotation(Override.class)
88-
.addParameter(AwsRequestOverrideConfig.class, "awsRequestOverrideConfig")
88+
.addParameter(AwsRequestOverrideConfiguration.class, "overrideConfiguration")
8989
.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
9090
.build());
9191

92-
builder.addMethod(MethodSpec.methodBuilder("requestOverrideConfig")
92+
builder.addMethod(MethodSpec.methodBuilder("overrideConfiguration")
9393
.addAnnotation(Override.class)
9494
.returns(builderInterfaceName())
95-
.addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfig.Builder.class),
95+
.addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfiguration.Builder.class),
9696
"builderConsumer")
9797
.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
9898
.build());
@@ -183,22 +183,22 @@ private List<MethodSpec> accessors() {
183183
}
184184

185185
if (isRequest()) {
186-
accessors.add(MethodSpec.methodBuilder("requestOverrideConfig")
186+
accessors.add(MethodSpec.methodBuilder("overrideConfiguration")
187187
.addAnnotation(Override.class)
188188
.returns(builderInterfaceName())
189-
.addParameter(AwsRequestOverrideConfig.class, "awsRequestOverrideConfig")
189+
.addParameter(AwsRequestOverrideConfiguration.class, "overrideConfiguration")
190190
.addModifiers(Modifier.PUBLIC)
191-
.addStatement("super.requestOverrideConfig(awsRequestOverrideConfig)")
191+
.addStatement("super.overrideConfiguration(overrideConfiguration)")
192192
.addStatement("return this")
193193
.build());
194194

195-
accessors.add(MethodSpec.methodBuilder("requestOverrideConfig")
195+
accessors.add(MethodSpec.methodBuilder("overrideConfiguration")
196196
.addAnnotation(Override.class)
197197
.returns(builderInterfaceName())
198-
.addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfig.Builder.class),
198+
.addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfiguration.Builder.class),
199199
"builderConsumer")
200200
.addModifiers(Modifier.PUBLIC)
201-
.addStatement("super.requestOverrideConfig(builderConsumer)")
201+
.addStatement("super.overrideConfiguration(builderConsumer)")
202202
.addStatement("return this")
203203
.build());
204204
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.stream.Collectors;
1414
import java.util.stream.Stream;
1515
import javax.annotation.Generated;
16-
import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
16+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
1717
import software.amazon.awssdk.core.runtime.StandardMemberCopier;
1818
import software.amazon.awssdk.core.runtime.TypeConverter;
1919
import software.amazon.awssdk.core.runtime.adapters.types.StringToByteBufferAdapter;
@@ -1056,10 +1056,10 @@ default Builder polymorphicTypeWithoutSubTypes(Consumer<SubTypeOne.Builder> poly
10561056
Builder enumType(EnumType enumType);
10571057

10581058
@Override
1059-
Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig);
1059+
Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration);
10601060

10611061
@Override
1062-
Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer);
1062+
Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
10631063
}
10641064

10651065
static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl implements Builder {
@@ -1592,14 +1592,14 @@ public final void setEnumType(String enumType) {
15921592
}
15931593

15941594
@Override
1595-
public Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig) {
1596-
super.requestOverrideConfig(awsRequestOverrideConfig);
1595+
public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) {
1596+
super.overrideConfiguration(overrideConfiguration);
15971597
return this;
15981598
}
15991599

16001600
@Override
1601-
public Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer) {
1602-
super.requestOverrideConfig(builderConsumer);
1601+
public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
1602+
super.overrideConfiguration(builderConsumer);
16031603
return this;
16041604
}
16051605

0 commit comments

Comments
 (0)