Renamed S3AdvancedConfiguration to S3Configuration and AdvancedServiceConfiguration to ServiceConfiguration.

.changes/next-release/feature-AWSSDKforJavav2-14a753c.json

@@ -0,0 +1,5 @@
+{
+    "category": "Amazon S3", 
+    "type": "feature", 
+    "description": "Renamed `S3AdvancedConfiguration` to `S3Configuration`"
+}

.changes/next-release/feature-AWSSDKforJavav2-7ac3210.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Renamed `AdvancedServiceConfiguration` to `ServiceConfiguration`"
+}

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

@@ -21,7 +21,7 @@
 import software.amazon.awssdk.awscore.config.AwsAsyncClientConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
-import software.amazon.awssdk.core.ServiceAdvancedConfiguration;
+import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.client.AsyncClientHandler;
 import software.amazon.awssdk.core.client.BaseClientHandler;
@@ -36,7 +36,7 @@ public final class AwsAsyncClientHandler extends BaseClientHandler implements As
 
     private final AsyncClientHandler delegateHandler;
 
-    public AwsAsyncClientHandler(AwsAsyncClientConfiguration clientConfiguration, ServiceAdvancedConfiguration
+    public AwsAsyncClientHandler(AwsAsyncClientConfiguration clientConfiguration, ServiceConfiguration
         advancedClientOption) {
         super(clientConfiguration, advancedClientOption);
         this.delegateHandler = new AwsAsyncClientHandlerImpl(clientConfiguration, advancedClientOption);

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

@@ -20,7 +20,7 @@
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.awscore.config.AwsAsyncClientConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.ServiceAdvancedConfiguration;
+import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.core.client.AsyncClientHandler;
 import software.amazon.awssdk.core.client.BaseAsyncClientHandler;
 import software.amazon.awssdk.core.http.AmazonAsyncHttpClient;
@@ -34,17 +34,17 @@
 @SdkProtectedApi
 final class AwsAsyncClientHandlerImpl extends BaseAsyncClientHandler {
     private final AwsAsyncClientConfiguration clientConfiguration;
-    private final ServiceAdvancedConfiguration serviceAdvancedConfiguration;
+    private final ServiceConfiguration serviceConfiguration;
 
-    AwsAsyncClientHandlerImpl(AwsAsyncClientConfiguration clientConfiguration, ServiceAdvancedConfiguration
-        serviceAdvancedConfiguration) {
-        super(clientConfiguration, serviceAdvancedConfiguration, new AmazonAsyncHttpClient(clientConfiguration));
+    AwsAsyncClientHandlerImpl(AwsAsyncClientConfiguration clientConfiguration, ServiceConfiguration
+            serviceConfiguration) {
+        super(clientConfiguration, serviceConfiguration, new AmazonAsyncHttpClient(clientConfiguration));
         this.clientConfiguration = clientConfiguration;
-        this.serviceAdvancedConfiguration = serviceAdvancedConfiguration;
+        this.serviceConfiguration = serviceConfiguration;
     }
 
     @Override
     protected ExecutionContext createExecutionContext(SdkRequest originalRequest) {
-        return AwsClientHandlerUtils.createExecutionContext(originalRequest, clientConfiguration, serviceAdvancedConfiguration);
+        return AwsClientHandlerUtils.createExecutionContext(originalRequest, clientConfiguration, serviceConfiguration);
     }
 }

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

@@ -24,7 +24,7 @@
 import software.amazon.awssdk.awscore.config.AwsClientConfiguration;
 import software.amazon.awssdk.core.RequestOverrideConfig;
 import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.ServiceAdvancedConfiguration;
+import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.core.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -41,7 +41,7 @@ private AwsClientHandlerUtils() {
 
     static ExecutionContext createExecutionContext(SdkRequest originalRequest,
                                                    AwsClientConfiguration clientConfiguration,
-                                                   ServiceAdvancedConfiguration serviceAdvancedConfiguration) {
+                                                   ServiceConfiguration serviceConfiguration) {
 
         AwsCredentialsProvider credentialsProvider = originalRequest.requestOverrideConfig()
                                                                     .filter(c -> c instanceof AwsRequestOverrideConfig)
@@ -56,7 +56,7 @@ static ExecutionContext createExecutionContext(SdkRequest originalRequest,
         Validate.validState(credentials != null, "Credential providers must never return null.");
 
         ExecutionAttributes executionAttributes = new ExecutionAttributes()
-            .putAttribute(AwsExecutionAttributes.SERVICE_ADVANCED_CONFIG, serviceAdvancedConfiguration)
+            .putAttribute(AwsExecutionAttributes.SERVICE_CONFIG, serviceConfiguration)
             .putAttribute(AwsExecutionAttributes.AWS_CREDENTIALS, credentials)
             .putAttribute(AwsExecutionAttributes.REQUEST_CONFIG, originalRequest.requestOverrideConfig()
                                                                                 .map(c -> (RequestOverrideConfig) c)

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

@@ -20,7 +20,7 @@
 import software.amazon.awssdk.awscore.config.AwsSyncClientConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
-import software.amazon.awssdk.core.ServiceAdvancedConfiguration;
+import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.core.client.BaseClientHandler;
 import software.amazon.awssdk.core.client.ClientExecutionParams;
 import software.amazon.awssdk.core.client.SyncClientHandler;
@@ -35,10 +35,10 @@ public class AwsSyncClientHandler extends BaseClientHandler implements SyncClien
 
     private final SyncClientHandler delegateHandler;
 
-    public AwsSyncClientHandler(AwsSyncClientConfiguration clientConfiguration, ServiceAdvancedConfiguration
-        serviceAdvancedConfiguration) {
-        super(clientConfiguration, serviceAdvancedConfiguration);
-        this.delegateHandler = new AwsSyncClientHandlerImpl(clientConfiguration, serviceAdvancedConfiguration);
+    public AwsSyncClientHandler(AwsSyncClientConfiguration clientConfiguration, ServiceConfiguration
+            serviceConfiguration) {
+        super(clientConfiguration, serviceConfiguration);
+        this.delegateHandler = new AwsSyncClientHandlerImpl(clientConfiguration, serviceConfiguration);
     }
 
     @Override

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

@@ -20,7 +20,7 @@
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.awscore.config.AwsSyncClientConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.ServiceAdvancedConfiguration;
+import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.core.client.BaseSyncClientHandler;
 import software.amazon.awssdk.core.client.SyncClientHandler;
 import software.amazon.awssdk.core.http.AmazonSyncHttpClient;
@@ -34,17 +34,17 @@
 @SdkProtectedApi
 final class AwsSyncClientHandlerImpl extends BaseSyncClientHandler {
     private final AwsSyncClientConfiguration clientConfiguration;
-    private final ServiceAdvancedConfiguration serviceAdvancedConfiguration;
+    private final ServiceConfiguration serviceConfiguration;
 
-    AwsSyncClientHandlerImpl(AwsSyncClientConfiguration clientConfiguration, ServiceAdvancedConfiguration
-        serviceAdvancedConfiguration) {
-        super(clientConfiguration, serviceAdvancedConfiguration, new AmazonSyncHttpClient(clientConfiguration));
+    AwsSyncClientHandlerImpl(AwsSyncClientConfiguration clientConfiguration, ServiceConfiguration
+            serviceConfiguration) {
+        super(clientConfiguration, serviceConfiguration, new AmazonSyncHttpClient(clientConfiguration));
         this.clientConfiguration = clientConfiguration;
-        this.serviceAdvancedConfiguration = serviceAdvancedConfiguration;
+        this.serviceConfiguration = serviceConfiguration;
     }
 
     @Override
     protected ExecutionContext createExecutionContext(SdkRequest originalRequest) {
-        return AwsClientHandlerUtils.createExecutionContext(originalRequest, clientConfiguration, serviceAdvancedConfiguration);
+        return AwsClientHandlerUtils.createExecutionContext(originalRequest, clientConfiguration, serviceConfiguration);
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java

@@ -58,14 +58,14 @@ public TypeSpec poetSpec() {
     }
 
     private MethodSpec buildClientMethod() {
-        String advancedConfigParam = model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null ?
-                ", advancedConfiguration()" : "";
+        String serviceConfigParam = model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null ?
+                ", serviceConfiguration()" : "";
         return MethodSpec.methodBuilder("buildClient")
                          .addAnnotation(Override.class)
                          .addModifiers(Modifier.PROTECTED, Modifier.FINAL)
                          .returns(clientInterfaceName)
                          .addCode("return new $T(super.asyncClientConfiguration() $L);",
-                                  clientClassName, advancedConfigParam)
+                                  clientClassName, serviceConfigParam)
                          .build();
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -64,9 +64,9 @@ public TypeSpec poetSpec() {
                                      ClassName.get(basePackage, model.getMetadata().getAsyncBuilder()));
 
         if (model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null) {
-            ClassName advancedConfiguration = ClassName.get(basePackage,
-                                                            model.getCustomizationConfig().getServiceSpecificClientConfigClass());
-            builder.addField(FieldSpec.builder(advancedConfiguration, "advancedConfiguration")
+            ClassName serviceConfiguration = ClassName.get(basePackage,
+                                                           model.getCustomizationConfig().getServiceSpecificClientConfigClass());
+            builder.addField(FieldSpec.builder(serviceConfiguration, "serviceConfiguration")
                                       .addModifiers(Modifier.PRIVATE)
                                       .build());
         }
@@ -76,9 +76,9 @@ public TypeSpec poetSpec() {
         builder.addMethod(defaultSignerProviderMethod());
 
         if (model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null) {
-            builder.addMethod(setAdvancedConfigurationMethod())
-                   .addMethod(getAdvancedConfigurationMethod())
-                   .addMethod(beanStyleSetAdvancedConfigurationMethod());
+            builder.addMethod(setServiceConfigurationMethod())
+                   .addMethod(getServiceConfigurationMethod())
+                   .addMethod(beanStyleSetServiceConfigurationMethod());
         }
 
         if (model.getCustomizationConfig().getServiceSpecificHttpConfig() != null) {
@@ -115,35 +115,35 @@ private MethodSpec serviceDefaultsMethod() {
                          .build();
     }
 
-    private MethodSpec setAdvancedConfigurationMethod() {
-        ClassName advancedConfiguration = ClassName.get(basePackage,
+    private MethodSpec setServiceConfigurationMethod() {
+        ClassName serviceConfiguration = ClassName.get(basePackage,
                                                         model.getCustomizationConfig().getServiceSpecificClientConfigClass());
-        return MethodSpec.methodBuilder("advancedConfiguration")
+        return MethodSpec.methodBuilder("serviceConfiguration")
                          .addModifiers(Modifier.PUBLIC)
                          .returns(TypeVariableName.get("B"))
-                         .addParameter(advancedConfiguration, "advancedConfiguration")
-                         .addStatement("this.advancedConfiguration = advancedConfiguration")
+                         .addParameter(serviceConfiguration, "serviceConfiguration")
+                         .addStatement("this.serviceConfiguration = serviceConfiguration")
                          .addStatement("return thisBuilder()")
                          .build();
     }
 
-    private MethodSpec getAdvancedConfigurationMethod() {
-        ClassName advancedConfiguration = ClassName.get(basePackage,
+    private MethodSpec getServiceConfigurationMethod() {
+        ClassName serviceConfiguration = ClassName.get(basePackage,
                                                         model.getCustomizationConfig().getServiceSpecificClientConfigClass());
-        return MethodSpec.methodBuilder("advancedConfiguration")
+        return MethodSpec.methodBuilder("serviceConfiguration")
                          .addModifiers(Modifier.PROTECTED)
-                         .returns(advancedConfiguration)
-                         .addStatement("return advancedConfiguration")
+                         .returns(serviceConfiguration)
+                         .addStatement("return serviceConfiguration")
                          .build();
     }
 
-    private MethodSpec beanStyleSetAdvancedConfigurationMethod() {
-        ClassName advancedConfiguration = ClassName.get(basePackage,
+    private MethodSpec beanStyleSetServiceConfigurationMethod() {
+        ClassName serviceConfiguration = ClassName.get(basePackage,
                                                         model.getCustomizationConfig().getServiceSpecificClientConfigClass());
-        return MethodSpec.methodBuilder("setAdvancedConfiguration")
+        return MethodSpec.methodBuilder("setServiceConfiguration")
                          .addModifiers(Modifier.PUBLIC)
-                         .addParameter(advancedConfiguration, "advancedConfiguration")
-                         .addStatement("advancedConfiguration(advancedConfiguration)")
+                         .addParameter(serviceConfiguration, "serviceConfiguration")
+                         .addStatement("serviceConfiguration(serviceConfiguration)")
                          .build();
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java

@@ -50,8 +50,8 @@ public TypeSpec poetSpec() {
                         .addJavadoc(getJavadoc());
 
         if (model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null) {
-            builder.addMethod(advancedConfigurationMethod());
-            builder.addMethod(advancedConfigurationConsumerBuilderMethod());
+            builder.addMethod(serviceConfigurationMethod());
+            builder.addMethod(serviceConfigurationConsumerBuilderMethod());
         }
 
         return builder.build();
@@ -64,27 +64,27 @@ private CodeBlock getJavadoc() {
                             ClassName.get(basePackage, model.getMetadata().getAsyncBuilderInterface()));
     }
 
-    private MethodSpec advancedConfigurationMethod() {
-        ClassName advancedConfiguration = ClassName.get(basePackage,
+    private MethodSpec serviceConfigurationMethod() {
+        ClassName serviceConfiguration = ClassName.get(basePackage,
                                                         model.getCustomizationConfig().getServiceSpecificClientConfigClass());
-        return MethodSpec.methodBuilder("advancedConfiguration")
+        return MethodSpec.methodBuilder("serviceConfiguration")
                          .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
                          .returns(TypeVariableName.get("B"))
-                         .addParameter(advancedConfiguration, "advancedConfiguration")
+                         .addParameter(serviceConfiguration, "serviceConfiguration")
                          .build();
     }
 
-    private MethodSpec advancedConfigurationConsumerBuilderMethod() {
-        ClassName advancedConfiguration = ClassName.get(basePackage,
+    private MethodSpec serviceConfigurationConsumerBuilderMethod() {
+        ClassName serviceConfiguration = ClassName.get(basePackage,
                                                         model.getCustomizationConfig().getServiceSpecificClientConfigClass());
         TypeName consumerBuilder = ParameterizedTypeName.get(ClassName.get(Consumer.class),
-                                                             advancedConfiguration.nestedClass("Builder"));
-        return MethodSpec.methodBuilder("advancedConfiguration")
+                                                             serviceConfiguration.nestedClass("Builder"));
+        return MethodSpec.methodBuilder("serviceConfiguration")
                          .addModifiers(Modifier.DEFAULT, Modifier.PUBLIC)
                          .returns(TypeVariableName.get("B"))
-                         .addParameter(consumerBuilder, "advancedConfiguration")
-                         .addStatement("return advancedConfiguration($T.builder().apply(advancedConfiguration).build())",
-                                       advancedConfiguration)
+                         .addParameter(consumerBuilder, "serviceConfiguration")
+                         .addStatement("return serviceConfiguration($T.builder().apply(serviceConfiguration).build())",
+                                       serviceConfiguration)
                          .build();
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java

@@ -59,14 +59,14 @@ public TypeSpec poetSpec() {
     }
 
     private MethodSpec buildClientMethod() {
-        String advancedConfigParam = model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null ?
-                ", advancedConfiguration()" : "";
+        String serviceConfigParam = model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null ?
+                ", serviceConfiguration()" : "";
         return MethodSpec.methodBuilder("buildClient")
                              .addAnnotation(Override.class)
                              .addModifiers(Modifier.PROTECTED, Modifier.FINAL)
                              .returns(clientInterfaceName)
                              .addCode("return new $T(super.syncClientConfiguration() $L);",
-                                      clientClassName, advancedConfigParam)
+                                      clientClassName, serviceConfigParam)
                              .build();
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java

@@ -68,7 +68,7 @@ public TypeSpec poetSpec() {
                                         .addMethod(protocolSpec.initProtocolFactory(model));
 
         if (model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null) {
-            classBuilder.addMethod(constructorWithAdvancedConfiguration());
+            classBuilder.addMethod(constructorWithServiceConfiguration());
         } else {
             classBuilder.addMethod(constructor());
         }
@@ -97,13 +97,13 @@ private MethodSpec nameMethod() {
                          .build();
     }
 
-    private MethodSpec constructorWithAdvancedConfiguration() {
-        ClassName advancedConfiguration = ClassName.get(basePackage,
+    private MethodSpec constructorWithServiceConfiguration() {
+        ClassName serviceConfiguration = ClassName.get(basePackage,
                                                         model.getCustomizationConfig().getServiceSpecificClientConfigClass());
         return MethodSpec.constructorBuilder()
                          .addModifiers(Modifier.PROTECTED)
                          .addParameter(AwsAsyncClientConfiguration.class, "clientConfiguration")
-                         .addParameter(advancedConfiguration, "serviceConfiguration")
+                         .addParameter(serviceConfiguration, "serviceConfiguration")
                          .addStatement("this.clientHandler = new $T(clientConfiguration, serviceConfiguration)",
                                        AwsAsyncClientHandler.class) // TODO this will likely differ for APIG clients
                          .addStatement("this.$N = init()", protocolSpec.protocolFactory(model).name)