Renaming apply

.changes/next-release/feature-AWSSDKforJavav2-e7dcef8.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Renaming `SdkBuilder.apply()` -> `SdkBuilder.applyMutation()` and renaming `ResponseTransformer.apply()` to `ResponseTransformer.transform()`."
+}

auth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java

@@ -150,7 +150,7 @@ public Builder profileFile(ProfileFile profileFile) {
          * removes the need to called {@link ProfileFile#builder()} and {@link ProfileFile.Builder#build()}.
          */
         public Builder profileFile(Consumer<ProfileFile.Builder> profileFile) {
-            return profileFile(ProfileFile.builder().apply(profileFile).build());
+            return profileFile(ProfileFile.builder().applyMutation(profileFile).build());
         }
 
         /**

aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/HttpTestUtils.java

@@ -78,7 +78,7 @@ public AmazonSyncHttpClient build() {
             SdkHttpClient sdkHttpClient = this.httpClient != null ? this.httpClient : testSdkHttpClient();
             return new AmazonSyncHttpClient(testClientConfiguration().toBuilder()
                                                                      .option(SdkClientOption.SYNC_HTTP_CLIENT, sdkHttpClient)
-                                                                     .apply(this::configureRetryPolicy)
+                                                                     .applyMutation(this::configureRetryPolicy)
                                                                      .build());
         }
 

aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java

@@ -93,7 +93,7 @@ public void doesNotRetryOnNonRetryableErrorCode() {
     }
 
     private boolean shouldRetry(Consumer<RetryPolicyContext.Builder> builder) {
-        return AWS_DEFAULT_RETRY_CONDITION.shouldRetry(RetryPolicyContext.builder().apply(builder).build());
+        return AWS_DEFAULT_RETRY_CONDITION.shouldRetry(RetryPolicyContext.builder().applyMutation(builder).build());
     }
 
     private Consumer<RetryPolicyContext.Builder> applyErrorCode(String errorCode) {

aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java

@@ -47,7 +47,7 @@ public void nonRetryableErrorCode_ReturnsFalse() {
     }
 
     private boolean shouldRetry(Consumer<RetryPolicyContext.Builder> builder) {
-        return condition.shouldRetry(RetryPolicyContext.builder().apply(builder).build());
+        return condition.shouldRetry(RetryPolicyContext.builder().applyMutation(builder).build());
     }
 
     private Consumer<RetryPolicyContext.Builder> applyErrorCode(String errorCode) {

codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java

@@ -72,7 +72,7 @@ public void execute() throws MojoExecutionException {
             try {
                 getLog().info("Loading from: " + p.toString());
                 generateCode(C2jModels.builder()
-                                      .apply(b -> loadCodeGenConfig(p).ifPresent(b::codeGenConfig))
+                                      .applyMutation(b -> loadCodeGenConfig(p).ifPresent(b::codeGenConfig))
                                       .customizationConfig(loadCustomizationConfig(p))
                                       .serviceModel(loadServiceModel(p))
                                       .waitersModel(loadWaiterModel(p))

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

@@ -83,7 +83,7 @@ private MethodSpec serviceConfigurationConsumerBuilderMethod() {
                          .addModifiers(Modifier.DEFAULT, Modifier.PUBLIC)
                          .returns(TypeVariableName.get("B"))
                          .addParameter(consumerBuilder, "serviceConfiguration")
-                         .addStatement("return serviceConfiguration($T.builder().apply(serviceConfiguration).build())",
+                         .addStatement("return serviceConfiguration($T.builder().applyMutation(serviceConfiguration).build())",
                                        serviceConfiguration)
                          .build();
     }

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

@@ -67,7 +67,7 @@ static MethodSpec consumerBuilderVariant(MethodSpec spec, String javadoc) {
 
 
         // Parameters
-        StringBuilder methodBody = new StringBuilder("return $L($T.builder().apply($L).build()");
+        StringBuilder methodBody = new StringBuilder("return $L($T.builder().applyMutation($L).build()");
         for (int i = 1; i < spec.parameters.size(); i++) {
             ParameterSpec parameter = spec.parameters.get(i);
             methodBody.append(", ").append(parameter.name);

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

@@ -157,7 +157,7 @@ private CodeBlock varargToListSetterBody() {
     }
 
     private CodeBlock consumerBuilderVarargSetterBody() {
-        return CodeBlock.of("$1L($2T.of($1L).map(c -> $3T.builder().apply(c).build()).collect($4T.toList()));",
+        return CodeBlock.of("$1L($2T.of($1L).map(c -> $3T.builder().applyMutation(c).build()).collect($4T.toList()));",
                             fieldName(), Stream.class, listElementType(), Collectors.class);
     }
 

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

@@ -136,7 +136,7 @@ private MethodSpec fluentConsumerFluentSetter(TypeName returnType) {
         ClassName builderClass = memberClass.nestedClass("Builder");
         return fluentDefaultSetterDeclaration(builderConsumerParam(builderClass), returnType)
             .addModifiers(Modifier.DEFAULT)
-            .addStatement("return $N($T.builder().apply($N).build())",
+            .addStatement("return $N($T.builder().applyMutation($N).build())",
                           memberModel().getFluentSetterMethodName(),
                           memberClass,
                           fieldName())

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-interface.java

@@ -28,6 +28,6 @@ public interface JsonBaseClientBuilder<B extends JsonBaseClientBuilder<B, C>, C>
     B serviceConfiguration(ServiceConfiguration serviceConfiguration);
 
     default B serviceConfiguration(Consumer<ServiceConfiguration.Builder> serviceConfiguration) {
-        return serviceConfiguration(ServiceConfiguration.builder().apply(serviceConfiguration).build());
+        return serviceConfiguration(ServiceConfiguration.builder().applyMutation(serviceConfiguration).build());
     }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java

@@ -107,7 +107,7 @@ default CompletableFuture<APostOperationResponse> aPostOperation(APostOperationR
      *      API Documentation</a>
      */
     default CompletableFuture<APostOperationResponse> aPostOperation(Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
-        return aPostOperation(APostOperationRequest.builder().apply(aPostOperationRequest).build());
+        return aPostOperation(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build());
     }
 
     /**
@@ -170,7 +170,7 @@ default CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOu
      */
     default CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOutput(
         Consumer<APostOperationWithOutputRequest.Builder> aPostOperationWithOutputRequest) {
-        return aPostOperationWithOutput(APostOperationWithOutputRequest.builder().apply(aPostOperationWithOutputRequest).build());
+        return aPostOperationWithOutput(APostOperationWithOutputRequest.builder().applyMutation(aPostOperationWithOutputRequest).build());
     }
 
     /**
@@ -233,7 +233,7 @@ default CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredM
      */
     default CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredMembers(
         Consumer<GetWithoutRequiredMembersRequest.Builder> getWithoutRequiredMembersRequest) {
-        return getWithoutRequiredMembers(GetWithoutRequiredMembersRequest.builder().apply(getWithoutRequiredMembersRequest)
+        return getWithoutRequiredMembers(GetWithoutRequiredMembersRequest.builder().applyMutation(getWithoutRequiredMembersRequest)
                                                                          .build());
     }
 
@@ -317,7 +317,7 @@ default CompletableFuture<PaginatedOperationWithResultKeyResponse> paginatedOper
     default CompletableFuture<PaginatedOperationWithResultKeyResponse> paginatedOperationWithResultKey(
         Consumer<PaginatedOperationWithResultKeyRequest.Builder> paginatedOperationWithResultKeyRequest) {
         return paginatedOperationWithResultKey(PaginatedOperationWithResultKeyRequest.builder()
-                                                                                     .apply(paginatedOperationWithResultKeyRequest).build());
+                                                                                     .applyMutation(paginatedOperationWithResultKeyRequest).build());
     }
 
     /**
@@ -541,7 +541,7 @@ default CompletableFuture<PaginatedOperationWithoutResultKeyResponse> paginatedO
     default CompletableFuture<PaginatedOperationWithoutResultKeyResponse> paginatedOperationWithoutResultKey(
         Consumer<PaginatedOperationWithoutResultKeyRequest.Builder> paginatedOperationWithoutResultKeyRequest) {
         return paginatedOperationWithoutResultKey(PaginatedOperationWithoutResultKeyRequest.builder()
-                                                                                           .apply(paginatedOperationWithoutResultKeyRequest).build());
+                                                                                           .applyMutation(paginatedOperationWithoutResultKeyRequest).build());
     }
 
     /**
@@ -694,7 +694,7 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes
     default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutResultKeyPaginator(
         Consumer<PaginatedOperationWithoutResultKeyRequest.Builder> paginatedOperationWithoutResultKeyRequest) {
         return paginatedOperationWithoutResultKeyPaginator(PaginatedOperationWithoutResultKeyRequest.builder()
-                                                                                                    .apply(paginatedOperationWithoutResultKeyRequest).build());
+                                                                                                    .applyMutation(paginatedOperationWithoutResultKeyRequest).build());
     }
 
     /**
@@ -758,7 +758,7 @@ default CompletableFuture<StreamingInputOperationResponse> streamingInputOperati
      */
     default CompletableFuture<StreamingInputOperationResponse> streamingInputOperation(
         Consumer<StreamingInputOperationRequest.Builder> streamingInputOperationRequest, AsyncRequestBody requestBody) {
-        return streamingInputOperation(StreamingInputOperationRequest.builder().apply(streamingInputOperationRequest).build(),
+        return streamingInputOperation(StreamingInputOperationRequest.builder().applyMutation(streamingInputOperationRequest).build(),
                                        requestBody);
     }
 
@@ -823,7 +823,7 @@ default CompletableFuture<StreamingInputOperationResponse> streamingInputOperati
      */
     default CompletableFuture<StreamingInputOperationResponse> streamingInputOperation(
         Consumer<StreamingInputOperationRequest.Builder> streamingInputOperationRequest, Path sourcePath) {
-        return streamingInputOperation(StreamingInputOperationRequest.builder().apply(streamingInputOperationRequest).build(),
+        return streamingInputOperation(StreamingInputOperationRequest.builder().applyMutation(streamingInputOperationRequest).build(),
                                        sourcePath);
     }
 
@@ -890,7 +890,7 @@ default <ReturnT> CompletableFuture<ReturnT> streamingOutputOperation(
     default <ReturnT> CompletableFuture<ReturnT> streamingOutputOperation(
         Consumer<StreamingOutputOperationRequest.Builder> streamingOutputOperationRequest,
         AsyncResponseTransformer<StreamingOutputOperationResponse, ReturnT> asyncResponseTransformer) {
-        return streamingOutputOperation(StreamingOutputOperationRequest.builder().apply(streamingOutputOperationRequest).build(),
+        return streamingOutputOperation(StreamingOutputOperationRequest.builder().applyMutation(streamingOutputOperationRequest).build(),
                                         asyncResponseTransformer);
     }
 
@@ -953,7 +953,7 @@ default CompletableFuture<StreamingOutputOperationResponse> streamingOutputOpera
      */
     default CompletableFuture<StreamingOutputOperationResponse> streamingOutputOperation(
         Consumer<StreamingOutputOperationRequest.Builder> streamingOutputOperationRequest, Path destinationPath) {
-        return streamingOutputOperation(StreamingOutputOperationRequest.builder().apply(streamingOutputOperationRequest).build(),
+        return streamingOutputOperation(StreamingOutputOperationRequest.builder().applyMutation(streamingOutputOperationRequest).build(),
                                         destinationPath);
     }
 }