Renamed RequestOverrideConfig to RequestOverrideConfiguration to match ClientOverrideConfiguration naming.

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

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Renamed `RequestOverrideConfig` to `RequestOverrideConfiguration` to match `ClientOverrideConfiguration` naming."
+}

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

@@ -17,15 +17,15 @@
 
 import java.util.Optional;
 import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.RequestOverrideConfig;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
 
 public class NoopTestRequest extends SdkRequest {
     private NoopTestRequest() {
 
     }
 
     @Override
-    public Optional<? extends RequestOverrideConfig> requestOverrideConfig() {
+    public Optional<? extends RequestOverrideConfiguration> overrideConfiguration() {
         return Optional.empty();
     }
 
@@ -46,7 +46,7 @@ public interface Builder extends SdkRequest.Builder {
     private static class BuilderImpl implements SdkRequest.Builder, Builder {
 
         @Override
-        public RequestOverrideConfig requestOverrideConfig() {
+        public RequestOverrideConfiguration overrideConfiguration() {
             return null;
         }
 

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

@@ -23,14 +23,14 @@
  * Base class for all AWS Service requests.
  */
 public abstract class AwsRequest extends SdkRequest {
-    private final AwsRequestOverrideConfig requestOverrideConfig;
+    private final AwsRequestOverrideConfiguration requestOverrideConfig;
 
     protected AwsRequest(Builder builder) {
-        this.requestOverrideConfig = builder.requestOverrideConfig();
+        this.requestOverrideConfig = builder.overrideConfiguration();
     }
 
     @Override
-    public final Optional<AwsRequestOverrideConfig> requestOverrideConfig() {
+    public final Optional<AwsRequestOverrideConfiguration> overrideConfiguration() {
         return Optional.ofNullable(requestOverrideConfig);
     }
 
@@ -39,55 +39,56 @@ public final Optional<AwsRequestOverrideConfig> requestOverrideConfig() {
 
     public interface Builder extends SdkRequest.Builder {
         @Override
-        AwsRequestOverrideConfig requestOverrideConfig();
+        AwsRequestOverrideConfiguration overrideConfiguration();
 
         /**
          * Add an optional request override configuration.
          *
          * @param awsRequestOverrideConfig The override configuration.
          * @return This object for method chaining.
          */
-        Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig);
+        Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig);
 
 
         /**
          * Add an optional request override configuration.
          *
-         * @param builderConsumer A {@link Consumer} to which an empty {@link AwsRequestOverrideConfig.Builder} will be given.
+         * @param builderConsumer A {@link Consumer} to which an empty {@link AwsRequestOverrideConfiguration.Builder} will be
+         * given.
          * @return This object for method chaining.
          */
-        Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer);
+        Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
 
         @Override
         AwsRequest build();
     }
 
     protected abstract static class BuilderImpl implements Builder {
-        private AwsRequestOverrideConfig awsRequestOverrideConfig;
+        private AwsRequestOverrideConfiguration awsRequestOverrideConfig;
 
         protected BuilderImpl() {
         }
 
         protected BuilderImpl(AwsRequest request) {
-            request.requestOverrideConfig().ifPresent(this::requestOverrideConfig);
+            request.overrideConfiguration().ifPresent(this::overrideConfiguration);
         }
 
         @Override
-        public Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig) {
+        public Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig) {
             this.awsRequestOverrideConfig = awsRequestOverrideConfig;
             return this;
         }
 
         @Override
-        public Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer) {
-            AwsRequestOverrideConfig.Builder b = AwsRequestOverrideConfig.builder();
+        public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
+            AwsRequestOverrideConfiguration.Builder b = AwsRequestOverrideConfiguration.builder();
             builderConsumer.accept(b);
             awsRequestOverrideConfig = b.build();
             return this;
         }
 
         @Override
-        public final AwsRequestOverrideConfig requestOverrideConfig() {
+        public final AwsRequestOverrideConfiguration overrideConfiguration() {
             return awsRequestOverrideConfig;
         }
     }

aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfig.java → aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfiguration.java

@@ -18,15 +18,15 @@
 import java.util.Optional;
 
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.core.RequestOverrideConfig;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
 
 /**
  * Request-specific configuration overrides for AWS service clients.
  */
-public final class AwsRequestOverrideConfig extends RequestOverrideConfig {
+public final class AwsRequestOverrideConfiguration extends RequestOverrideConfiguration {
     private final AwsCredentialsProvider credentialsProvider;
 
-    private AwsRequestOverrideConfig(Builder builder) {
+    private AwsRequestOverrideConfiguration(Builder builder) {
         super(builder);
         this.credentialsProvider = builder.credentialsProvider();
     }
@@ -49,7 +49,7 @@ public static Builder builder() {
         return new BuilderImpl();
     }
 
-    public interface Builder extends RequestOverrideConfig.Builder<Builder> {
+    public interface Builder extends RequestOverrideConfiguration.Builder<Builder> {
         /**
          * Set the optional {@link AwsCredentialsProvider} that will provide credentials to be used to authenticate this request.
          *
@@ -67,18 +67,18 @@ public interface Builder extends RequestOverrideConfig.Builder<Builder> {
         AwsCredentialsProvider credentialsProvider();
 
         @Override
-        AwsRequestOverrideConfig build();
+        AwsRequestOverrideConfiguration build();
     }
 
-    private static final class BuilderImpl extends RequestOverrideConfig.BuilderImpl<Builder> implements Builder {
+    private static final class BuilderImpl extends RequestOverrideConfiguration.BuilderImpl<Builder> implements Builder {
 
         private AwsCredentialsProvider awsCredentialsProvider;
 
 
         private BuilderImpl() {
         }
 
-        private BuilderImpl(AwsRequestOverrideConfig awsRequestOverrideConfig) {
+        private BuilderImpl(AwsRequestOverrideConfiguration awsRequestOverrideConfig) {
             super(awsRequestOverrideConfig);
             this.awsCredentialsProvider = awsRequestOverrideConfig.credentialsProvider;
         }
@@ -95,8 +95,8 @@ public AwsCredentialsProvider credentialsProvider() {
         }
 
         @Override
-        public AwsRequestOverrideConfig build() {
-            return new AwsRequestOverrideConfig(this);
+        public AwsRequestOverrideConfiguration build() {
+            return new AwsRequestOverrideConfiguration(this);
         }
     }
 }

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

@@ -19,10 +19,10 @@
 import software.amazon.awssdk.auth.AwsExecutionAttributes;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.awscore.config.AwsAdvancedClientOption;
 import software.amazon.awssdk.awscore.config.AwsClientConfiguration;
-import software.amazon.awssdk.core.RequestOverrideConfig;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.core.config.ClientOverrideConfiguration;
@@ -43,10 +43,10 @@ static ExecutionContext createExecutionContext(SdkRequest originalRequest,
                                                    AwsClientConfiguration clientConfiguration,
                                                    ServiceConfiguration serviceConfiguration) {
 
-        AwsCredentialsProvider credentialsProvider = originalRequest.requestOverrideConfig()
-                                                                    .filter(c -> c instanceof AwsRequestOverrideConfig)
-                                                                    .map(c -> (AwsRequestOverrideConfig) c)
-                                                                    .flatMap(AwsRequestOverrideConfig::credentialsProvider)
+        AwsCredentialsProvider credentialsProvider = originalRequest.overrideConfiguration()
+                                                                    .filter(c -> c instanceof AwsRequestOverrideConfiguration)
+                                                                    .map(c -> (AwsRequestOverrideConfiguration) c)
+                                                                    .flatMap(AwsRequestOverrideConfiguration::credentialsProvider)
                                                                     .orElse(clientConfiguration.credentialsProvider());
 
         ClientOverrideConfiguration overrideConfiguration = clientConfiguration.overrideConfiguration();
@@ -58,10 +58,10 @@ static ExecutionContext createExecutionContext(SdkRequest originalRequest,
         ExecutionAttributes executionAttributes = new ExecutionAttributes()
             .putAttribute(AwsExecutionAttributes.SERVICE_CONFIG, serviceConfiguration)
             .putAttribute(AwsExecutionAttributes.AWS_CREDENTIALS, credentials)
-            .putAttribute(AwsExecutionAttributes.REQUEST_CONFIG, originalRequest.requestOverrideConfig()
-                                                                                .map(c -> (RequestOverrideConfig) c)
-                                                                                .orElse(AwsRequestOverrideConfig.builder()
-                                                                                                                .build()))
+            .putAttribute(AwsExecutionAttributes.REQUEST_CONFIG, originalRequest.overrideConfiguration()
+                                                                                .map(c -> (RequestOverrideConfiguration) c)
+                                                                                .orElse(AwsRequestOverrideConfiguration.builder()
+                                                                                                                       .build()))
             .putAttribute(AwsExecutionAttributes.AWS_REGION,
                           overrideConfiguration.advancedOption(AwsAdvancedClientOption.AWS_REGION));
 

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

@@ -16,7 +16,7 @@
 package software.amazon.awssdk.awscore.client.http;
 
 import software.amazon.awssdk.awscore.AwsRequest;
-import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 
 public class NoopTestAwsRequest extends AwsRequest {
     private NoopTestAwsRequest(Builder builder) {
@@ -37,7 +37,7 @@ public interface Builder extends AwsRequest.Builder {
         NoopTestAwsRequest build();
 
         @Override
-        Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig);
+        Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig);
     }
 
     private static class BuilderImpl extends AwsRequest.BuilderImpl implements Builder {
@@ -48,8 +48,8 @@ public NoopTestAwsRequest build() {
         }
 
         @Override
-        public Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig) {
-            super.requestOverrideConfig(awsRequestOverrideConfig);
+        public Builder overrideConfiguration(AwsRequestOverrideConfiguration awsRequestOverrideConfig) {
+            super.overrideConfiguration(awsRequestOverrideConfig);
             return this;
         }
     }

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

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 import javax.lang.model.element.Modifier;
-import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeType;
@@ -82,17 +82,17 @@ public TypeSpec builderInterface() {
         }
 
         if (isRequest()) {
-            builder.addMethod(MethodSpec.methodBuilder("requestOverrideConfig")
+            builder.addMethod(MethodSpec.methodBuilder("overrideConfiguration")
                     .returns(builderInterfaceName())
                     .addAnnotation(Override.class)
-                    .addParameter(AwsRequestOverrideConfig.class, "awsRequestOverrideConfig")
+                    .addParameter(AwsRequestOverrideConfiguration.class, "overrideConfiguration")
                     .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
                     .build());
 
-            builder.addMethod(MethodSpec.methodBuilder("requestOverrideConfig")
+            builder.addMethod(MethodSpec.methodBuilder("overrideConfiguration")
                     .addAnnotation(Override.class)
                     .returns(builderInterfaceName())
-                    .addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfig.Builder.class),
+                    .addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfiguration.Builder.class),
                             "builderConsumer")
                     .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
                     .build());
@@ -183,22 +183,22 @@ private List<MethodSpec> accessors() {
         }
 
         if (isRequest()) {
-            accessors.add(MethodSpec.methodBuilder("requestOverrideConfig")
+            accessors.add(MethodSpec.methodBuilder("overrideConfiguration")
                     .addAnnotation(Override.class)
                     .returns(builderInterfaceName())
-                    .addParameter(AwsRequestOverrideConfig.class, "awsRequestOverrideConfig")
+                    .addParameter(AwsRequestOverrideConfiguration.class, "overrideConfiguration")
                     .addModifiers(Modifier.PUBLIC)
-                    .addStatement("super.requestOverrideConfig(awsRequestOverrideConfig)")
+                    .addStatement("super.overrideConfiguration(overrideConfiguration)")
                     .addStatement("return this")
                     .build());
 
-            accessors.add(MethodSpec.methodBuilder("requestOverrideConfig")
+            accessors.add(MethodSpec.methodBuilder("overrideConfiguration")
                     .addAnnotation(Override.class)
                     .returns(builderInterfaceName())
-                    .addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfig.Builder.class),
+                    .addParameter(ParameterizedTypeName.get(Consumer.class, AwsRequestOverrideConfiguration.Builder.class),
                             "builderConsumer")
                     .addModifiers(Modifier.PUBLIC)
-                    .addStatement("super.requestOverrideConfig(builderConsumer)")
+                    .addStatement("super.overrideConfiguration(builderConsumer)")
                     .addStatement("return this")
                     .build());
         }

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

@@ -13,7 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Generated;
-import software.amazon.awssdk.awscore.AwsRequestOverrideConfig;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.core.runtime.StandardMemberCopier;
 import software.amazon.awssdk.core.runtime.TypeConverter;
 import software.amazon.awssdk.core.runtime.adapters.types.StringToByteBufferAdapter;
@@ -1056,10 +1056,10 @@ default Builder polymorphicTypeWithoutSubTypes(Consumer<SubTypeOne.Builder> poly
         Builder enumType(EnumType enumType);
 
         @Override
-        Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig);
+        Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration);
 
         @Override
-        Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer);
+        Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
     }
 
     static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl implements Builder {
@@ -1592,14 +1592,14 @@ public final void setEnumType(String enumType) {
         }
 
         @Override
-        public Builder requestOverrideConfig(AwsRequestOverrideConfig awsRequestOverrideConfig) {
-            super.requestOverrideConfig(awsRequestOverrideConfig);
+        public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) {
+            super.overrideConfiguration(overrideConfiguration);
             return this;
         }
 
         @Override
-        public Builder requestOverrideConfig(Consumer<AwsRequestOverrideConfig.Builder> builderConsumer) {
-            super.requestOverrideConfig(builderConsumer);
+        public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
+            super.overrideConfiguration(builderConsumer);
             return this;
         }