Skip to content

Commit 1a65053

Browse files
zoewanggzoewangg
committed
rename SdkBuilder.apply to SdkBuilder.applyMutator to applyMutation
rename ResponseTransform.apply() to ResponseTransform.transform()
1 parent 9518f51 commit 1a65053

File tree

48 files changed

+111
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+111
-119
lines changed

‎.changes/next-release/feature-AWSSDKforJavav2-e7dcef8.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": "Renaming `SdkBuilder.apply()` -> `SdkBuilder.applyMutation()` and renaming `ResponseTransformer.apply()` to `ResponseTransformer.transform()`."
5+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public Builder profileFile(ProfileFile profileFile) {
150150
* removes the need to called {@link ProfileFile#builder()} and {@link ProfileFile.Builder#build()}.
151151
*/
152152
public Builder profileFile(Consumer<ProfileFile.Builder> profileFile) {
153-
return profileFile(ProfileFile.builder().apply(profileFile).build());
153+
return profileFile(ProfileFile.builder().applyMutation(profileFile).build());
154154
}
155155

156156
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public AmazonSyncHttpClient build() {
7878
SdkHttpClient sdkHttpClient = this.httpClient != null ? this.httpClient : testSdkHttpClient();
7979
return new AmazonSyncHttpClient(testClientConfiguration().toBuilder()
8080
.option(SdkClientOption.SYNC_HTTP_CLIENT, sdkHttpClient)
81-
.apply(this::configureRetryPolicy)
81+
.applyMutation(this::configureRetryPolicy)
8282
.build());
8383
}
8484

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void doesNotRetryOnNonRetryableErrorCode() {
9393
}
9494

9595
private boolean shouldRetry(Consumer<RetryPolicyContext.Builder> builder) {
96-
return AWS_DEFAULT_RETRY_CONDITION.shouldRetry(RetryPolicyContext.builder().apply(builder).build());
96+
return AWS_DEFAULT_RETRY_CONDITION.shouldRetry(RetryPolicyContext.builder().applyMutation(builder).build());
9797
}
9898

9999
private Consumer<RetryPolicyContext.Builder> applyErrorCode(String errorCode) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void nonRetryableErrorCode_ReturnsFalse() {
4747
}
4848

4949
private boolean shouldRetry(Consumer<RetryPolicyContext.Builder> builder) {
50-
return condition.shouldRetry(RetryPolicyContext.builder().apply(builder).build());
50+
return condition.shouldRetry(RetryPolicyContext.builder().applyMutation(builder).build());
5151
}
5252

5353
private Consumer<RetryPolicyContext.Builder> applyErrorCode(String errorCode) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void execute() throws MojoExecutionException {
7272
try {
7373
getLog().info("Loading from: " + p.toString());
7474
generateCode(C2jModels.builder()
75-
.apply(b -> loadCodeGenConfig(p).ifPresent(b::codeGenConfig))
75+
.applyMutation(b -> loadCodeGenConfig(p).ifPresent(b::codeGenConfig))
7676
.customizationConfig(loadCustomizationConfig(p))
7777
.serviceModel(loadServiceModel(p))
7878
.waitersModel(loadWaiterModel(p))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private MethodSpec serviceConfigurationConsumerBuilderMethod() {
8383
.addModifiers(Modifier.DEFAULT, Modifier.PUBLIC)
8484
.returns(TypeVariableName.get("B"))
8585
.addParameter(consumerBuilder, "serviceConfiguration")
86-
.addStatement("return serviceConfiguration($T.builder().apply(serviceConfiguration).build())",
86+
.addStatement("return serviceConfiguration($T.builder().applyMutation(serviceConfiguration).build())",
8787
serviceConfiguration)
8888
.build();
8989
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static MethodSpec consumerBuilderVariant(MethodSpec spec, String javadoc) {
6767

6868

6969
// Parameters
70-
StringBuilder methodBody = new StringBuilder("return $L($T.builder().apply($L).build()");
70+
StringBuilder methodBody = new StringBuilder("return $L($T.builder().applyMutation($L).build()");
7171
for (int i = 1; i < spec.parameters.size(); i++) {
7272
ParameterSpec parameter = spec.parameters.get(i);
7373
methodBody.append(", ").append(parameter.name);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private CodeBlock varargToListSetterBody() {
157157
}
158158

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private MethodSpec fluentConsumerFluentSetter(TypeName returnType) {
136136
ClassName builderClass = memberClass.nestedClass("Builder");
137137
return fluentDefaultSetterDeclaration(builderConsumerParam(builderClass), returnType)
138138
.addModifiers(Modifier.DEFAULT)
139-
.addStatement("return $N($T.builder().apply($N).build())",
139+
.addStatement("return $N($T.builder().applyMutation($N).build())",
140140
memberModel().getFluentSetterMethodName(),
141141
memberClass,
142142
fieldName())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ public interface JsonBaseClientBuilder<B extends JsonBaseClientBuilder<B, C>, C>
2828
B serviceConfiguration(ServiceConfiguration serviceConfiguration);
2929

3030
default B serviceConfiguration(Consumer<ServiceConfiguration.Builder> serviceConfiguration) {
31-
return serviceConfiguration(ServiceConfiguration.builder().apply(serviceConfiguration).build());
31+
return serviceConfiguration(ServiceConfiguration.builder().applyMutation(serviceConfiguration).build());
3232
}
3333
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ default CompletableFuture<APostOperationResponse> aPostOperation(APostOperationR
107107
* API Documentation</a>
108108
*/
109109
default CompletableFuture<APostOperationResponse> aPostOperation(Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
110-
return aPostOperation(APostOperationRequest.builder().apply(aPostOperationRequest).build());
110+
return aPostOperation(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build());
111111
}
112112

113113
/**
@@ -170,7 +170,7 @@ default CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOu
170170
*/
171171
default CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOutput(
172172
Consumer<APostOperationWithOutputRequest.Builder> aPostOperationWithOutputRequest) {
173-
return aPostOperationWithOutput(APostOperationWithOutputRequest.builder().apply(aPostOperationWithOutputRequest).build());
173+
return aPostOperationWithOutput(APostOperationWithOutputRequest.builder().applyMutation(aPostOperationWithOutputRequest).build());
174174
}
175175

176176
/**
@@ -233,7 +233,7 @@ default CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredM
233233
*/
234234
default CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredMembers(
235235
Consumer<GetWithoutRequiredMembersRequest.Builder> getWithoutRequiredMembersRequest) {
236-
return getWithoutRequiredMembers(GetWithoutRequiredMembersRequest.builder().apply(getWithoutRequiredMembersRequest)
236+
return getWithoutRequiredMembers(GetWithoutRequiredMembersRequest.builder().applyMutation(getWithoutRequiredMembersRequest)
237237
.build());
238238
}
239239

@@ -317,7 +317,7 @@ default CompletableFuture<PaginatedOperationWithResultKeyResponse> paginatedOper
317317
default CompletableFuture<PaginatedOperationWithResultKeyResponse> paginatedOperationWithResultKey(
318318
Consumer<PaginatedOperationWithResultKeyRequest.Builder> paginatedOperationWithResultKeyRequest) {
319319
return paginatedOperationWithResultKey(PaginatedOperationWithResultKeyRequest.builder()
320-
.apply(paginatedOperationWithResultKeyRequest).build());
320+
.applyMutation(paginatedOperationWithResultKeyRequest).build());
321321
}
322322

323323
/**
@@ -541,7 +541,7 @@ default CompletableFuture<PaginatedOperationWithoutResultKeyResponse> paginatedO
541541
default CompletableFuture<PaginatedOperationWithoutResultKeyResponse> paginatedOperationWithoutResultKey(
542542
Consumer<PaginatedOperationWithoutResultKeyRequest.Builder> paginatedOperationWithoutResultKeyRequest) {
543543
return paginatedOperationWithoutResultKey(PaginatedOperationWithoutResultKeyRequest.builder()
544-
.apply(paginatedOperationWithoutResultKeyRequest).build());
544+
.applyMutation(paginatedOperationWithoutResultKeyRequest).build());
545545
}
546546

547547
/**
@@ -694,7 +694,7 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes
694694
default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutResultKeyPaginator(
695695
Consumer<PaginatedOperationWithoutResultKeyRequest.Builder> paginatedOperationWithoutResultKeyRequest) {
696696
return paginatedOperationWithoutResultKeyPaginator(PaginatedOperationWithoutResultKeyRequest.builder()
697-
.apply(paginatedOperationWithoutResultKeyRequest).build());
697+
.applyMutation(paginatedOperationWithoutResultKeyRequest).build());
698698
}
699699

700700
/**
@@ -758,7 +758,7 @@ default CompletableFuture<StreamingInputOperationResponse> streamingInputOperati
758758
*/
759759
default CompletableFuture<StreamingInputOperationResponse> streamingInputOperation(
760760
Consumer<StreamingInputOperationRequest.Builder> streamingInputOperationRequest, AsyncRequestBody requestBody) {
761-
return streamingInputOperation(StreamingInputOperationRequest.builder().apply(streamingInputOperationRequest).build(),
761+
return streamingInputOperation(StreamingInputOperationRequest.builder().applyMutation(streamingInputOperationRequest).build(),
762762
requestBody);
763763
}
764764

@@ -823,7 +823,7 @@ default CompletableFuture<StreamingInputOperationResponse> streamingInputOperati
823823
*/
824824
default CompletableFuture<StreamingInputOperationResponse> streamingInputOperation(
825825
Consumer<StreamingInputOperationRequest.Builder> streamingInputOperationRequest, Path sourcePath) {
826-
return streamingInputOperation(StreamingInputOperationRequest.builder().apply(streamingInputOperationRequest).build(),
826+
return streamingInputOperation(StreamingInputOperationRequest.builder().applyMutation(streamingInputOperationRequest).build(),
827827
sourcePath);
828828
}
829829

@@ -890,7 +890,7 @@ default <ReturnT> CompletableFuture<ReturnT> streamingOutputOperation(
890890
default <ReturnT> CompletableFuture<ReturnT> streamingOutputOperation(
891891
Consumer<StreamingOutputOperationRequest.Builder> streamingOutputOperationRequest,
892892
AsyncResponseTransformer<StreamingOutputOperationResponse, ReturnT> asyncResponseTransformer) {
893-
return streamingOutputOperation(StreamingOutputOperationRequest.builder().apply(streamingOutputOperationRequest).build(),
893+
return streamingOutputOperation(StreamingOutputOperationRequest.builder().applyMutation(streamingOutputOperationRequest).build(),
894894
asyncResponseTransformer);
895895
}
896896

@@ -953,7 +953,7 @@ default CompletableFuture<StreamingOutputOperationResponse> streamingOutputOpera
953953
*/
954954
default CompletableFuture<StreamingOutputOperationResponse> streamingOutputOperation(
955955
Consumer<StreamingOutputOperationRequest.Builder> streamingOutputOperationRequest, Path destinationPath) {
956-
return streamingOutputOperation(StreamingOutputOperationRequest.builder().apply(streamingOutputOperationRequest).build(),
956+
return streamingOutputOperation(StreamingOutputOperationRequest.builder().applyMutation(streamingOutputOperationRequest).build(),
957957
destinationPath);
958958
}
959959
}

0 commit comments

Comments
 (0)