Add ServiceClientConfiguration to SdkClient #3830
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.codegen.poet.model; | ||
|
|
||
| import static javax.lang.model.element.Modifier.FINAL; | ||
| import static javax.lang.model.element.Modifier.PRIVATE; | ||
| import static javax.lang.model.element.Modifier.PUBLIC; | ||
|
|
||
| import com.squareup.javapoet.ClassName; | ||
| import com.squareup.javapoet.FieldSpec; | ||
| import com.squareup.javapoet.MethodSpec; | ||
| import com.squareup.javapoet.TypeSpec; | ||
| import software.amazon.awssdk.annotations.SdkInternalApi; | ||
| import software.amazon.awssdk.awscore.client.config.AwsClientOption; | ||
| import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel; | ||
| import software.amazon.awssdk.codegen.poet.ClassSpec; | ||
| import software.amazon.awssdk.codegen.poet.PoetUtils; | ||
| import software.amazon.awssdk.core.ServiceClientConfiguration; | ||
| import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; | ||
| import software.amazon.awssdk.core.client.config.SdkClientConfiguration; | ||
|
|
||
| public class DefaultServiceClientConfigurationClass implements ClassSpec { | ||
|
|
||
| private final ClassName defaultClientMetadataClassName; | ||
|
|
||
| public DefaultServiceClientConfigurationClass(IntermediateModel model) { | ||
| String basePackage = model.getMetadata().getFullModelPackageName(); | ||
|
There was a problem hiding this comment. The default client config class is annotated as Internal, but it's placed in the |
||
| this.defaultClientMetadataClassName = ClassName.get(basePackage, "DefaultServiceClientConfiguration"); | ||
| } | ||
|
|
||
| @Override | ||
| public TypeSpec poetSpec() { | ||
| return PoetUtils.createClassBuilder(defaultClientMetadataClassName) | ||
| .addSuperinterface(ServiceClientConfiguration.class) | ||
| .addMethod(constructor()) | ||
| .addMethod(regionMethod()) | ||
| .addMethod(clientOverrideConfigMethod()) | ||
| .addModifiers(PUBLIC) | ||
| .addAnnotation(SdkInternalApi.class) | ||
| .addField(regionField()) | ||
| .addField(clientOverrideConfigField()) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| public ClassName className() { | ||
| return defaultClientMetadataClassName; | ||
| } | ||
|
|
||
| public MethodSpec constructor() { | ||
| return MethodSpec.constructorBuilder() | ||
| .addModifiers(PUBLIC) | ||
| .addParameter(SdkClientConfiguration.class, "clientConfiguration") | ||
| .addParameter(ClientOverrideConfiguration.class, "clientOverrideConfiguration") | ||
| .addStatement("this.region = clientConfiguration.option($T.AWS_REGION).toString()", | ||
| AwsClientOption.class) | ||
| .addStatement("this.overrideConfiguration = clientOverrideConfiguration") | ||
| .build(); | ||
| } | ||
|
|
||
| public MethodSpec regionMethod() { | ||
| return MethodSpec.methodBuilder("region") | ||
| .addModifiers(PUBLIC) | ||
| .returns(String.class) | ||
| .addStatement("return this.region") | ||
| .build(); | ||
| } | ||
|
|
||
| public FieldSpec regionField() { | ||
| return FieldSpec.builder(ClassName.get(String.class), "region") | ||
| .addModifiers(PRIVATE, FINAL) | ||
| .build(); | ||
| } | ||
|
|
||
| public MethodSpec clientOverrideConfigMethod() { | ||
| return MethodSpec.methodBuilder("overrideConfiguration") | ||
| .addModifiers(PUBLIC) | ||
| .returns(ClientOverrideConfiguration.class) | ||
| .addStatement("return this.overrideConfiguration") | ||
| .build(); | ||
| } | ||
|
|
||
| public FieldSpec clientOverrideConfigField() { | ||
| return FieldSpec.builder(ClassName.get(ClientOverrideConfiguration.class), "overrideConfiguration") | ||
| .addModifiers(PRIVATE, FINAL) | ||
| .build(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you use
addStatementyou don't have to add the semicolon and the code looks cleanerThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated to addStatement