-
Notifications
You must be signed in to change notification settings - Fork 28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix smithy sdk no default client #564
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0b43601
Only generate reference to the default client if a protocol generator…
kggilmer 459dbb0
Update unit test for default client generation
kggilmer 6312843
Update tests to work more consistently with previous versions
kggilmer 97a5455
Tweaks from feedback
kggilmer fddf141
Merge branch 'main' into fix-smithy-sdk-no-default-client
kggilmer 981c822
Merge branch 'main' into fix-smithy-sdk-no-default-client
kggilmer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -44,7 +44,8 @@ class ServiceGenerator(private val ctx: RenderingContext<ServiceShape>) { | |
require(ctx.shape is ServiceShape) { "ServiceShape is required for generating a service interface; was: ${ctx.shape}" } | ||
} | ||
|
||
private val service: ServiceShape = requireNotNull(ctx.shape) { "ServiceShape is required to render a service client" } | ||
private val service: ServiceShape = | ||
requireNotNull(ctx.shape) { "ServiceShape is required to render a service client" } | ||
private val serviceSymbol = ctx.symbolProvider.toSymbol(service) | ||
private val writer = ctx.writer | ||
|
||
|
@@ -72,7 +73,7 @@ class ServiceGenerator(private val ctx: RenderingContext<ServiceShape>) { | |
SectionServiceCompanionObject, | ||
context = mapOf(SectionServiceCompanionObject.ServiceSymbol to serviceSymbol) | ||
) { | ||
renderCompanionObject() | ||
renderCompanionObject(ctx.protocolGenerator != null) | ||
} | ||
writer.write("") | ||
renderServiceConfig() | ||
|
@@ -109,16 +110,20 @@ class ServiceGenerator(private val ctx: RenderingContext<ServiceShape>) { | |
* operator fun invoke(config: Config): LambdaClient = DefaultLambdaClient(config) | ||
* } | ||
* ``` | ||
* @param hasProtocolGenerator true if there is a [ProtocolGenerator] set on the [RenderingContext]. This | ||
* determines if the SDK will generate a default client implementation. If there is no [ProtocolGenerator], do not | ||
* codegen references to the non-existent default client. | ||
*/ | ||
private fun renderCompanionObject() { | ||
private fun renderCompanionObject(hasProtocolGenerator: Boolean) { | ||
writer.withBlock("companion object {", "}") { | ||
withBlock("operator fun invoke(block: Config.Builder.() -> Unit = {}): ${serviceSymbol.name} {", "}") { | ||
write("val config = Config.Builder().apply(block).build()") | ||
write("return Default${serviceSymbol.name}(config)") | ||
this.callIf(hasProtocolGenerator) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit/style does |
||
withBlock("operator fun invoke(block: Config.Builder.() -> Unit = {}): ${serviceSymbol.name} {", "}") { | ||
write("val config = Config.Builder().apply(block).build()") | ||
write("return Default${serviceSymbol.name}(config)") | ||
} | ||
write("") | ||
write("operator fun invoke(config: Config): ${serviceSymbol.name} = Default${serviceSymbol.name}(config)") | ||
} | ||
|
||
write("") | ||
write("operator fun invoke(config: Config): ${serviceSymbol.name} = Default${serviceSymbol.name}(config)") | ||
} | ||
} | ||
|
||
|
This file contains 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
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.
style
ctx
is a property on the class, no real reason to thread through the parameter