Skip to content

Commit ec79425

Browse files
committed
Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into feat-configure-waiters
2 parents bba7bc2 + 1b5d3ce commit ec79425

File tree

44 files changed

+210
-254
lines changed

Some content is hidden

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

44 files changed

+210
-254
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "68aac1d5-64f9-4569-bf95-db8d5712a2df",
3+
"type": "bugfix",
4+
"description": "Infer the replayability of `InputStream` using `markSupported()` when setting `isOneShot`"
5+
}

CHANGELOG.md

Lines changed: 87 additions & 85 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ of your request may disagree and ask that you add one anyway.
8484
"type": "feature",
8585
"description": "Add multiplatform support for URL parsing",
8686
"issues": [
87-
"awslabs/smithy-kotlin#12345"
87+
"smithy-lang/smithy-kotlin#12345"
8888
]
8989
}
9090
```

bom/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ fun DependencyConstraintHandler.api(constraintNotation: Any) =
6969

7070
createBomConstraintsAndVersionCatalog()
7171

72-
configurePublishing("smithy-kotlin")
73-
72+
configurePublishing("smithy-kotlin", "smithy-lang")
7473
publishing {
7574
publications {
7675
create("bom", MavenPublication::class) {

codegen/smithy-aws-kotlin-codegen/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ publishing {
107107
}
108108
}
109109

110-
configurePublishing("smithy-kotlin")
110+
configurePublishing("smithy-kotlin", "smithy-lang")

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class RestJson1 : JsonHttpBindingProtocolGenerator() {
4646

4747
// restjson1 has some different semantics and expectations around empty structures bound via @httpPayload trait
4848
// * empty structures get serialized to `{}`
49-
// see: https://github.com/awslabs/smithy/pull/924
49+
// see: https://github.com/smithy-lang/smithy/pull/924
5050
val requestBindings = resolver.requestBindings(op)
5151
val httpPayload = requestBindings.firstOrNull { it.location == HttpBinding.Location.PAYLOAD }
5252
if (httpPayload != null) {
@@ -58,7 +58,7 @@ class RestJson1 : JsonHttpBindingProtocolGenerator() {
5858
write("builder.body = #T.fromBytes(#S.encodeToByteArray())", RuntimeTypes.Http.HttpBody, "{}")
5959
}
6060
// Content-Type still needs to be set for non-structured payloads
61-
// https://github.com/awslabs/smithy/blob/main/smithy-aws-protocol-tests/model/restJson1/http-content-type.smithy#L174
61+
// https://github.com/smithy-lang/smithy/blob/main/smithy-aws-protocol-tests/model/restJson1/http-content-type.smithy#L174
6262
write("builder.headers.setMissing(\"Content-Type\", #S)", resolver.determineRequestContentType(op))
6363
}
6464
}

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/xml/RestXmlSerdeDescriptorGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class RestXmlSerdeDescriptorGenerator(
3434
val serialName = getSerialName(member, nameSuffix)
3535
if (serialName.equals("message", ignoreCase = true)) {
3636
// Need to be able to read error messages from "Message" or "message"
37-
// https://github.com/awslabs/smithy-kotlin/issues/352
37+
// https://github.com/smithy-lang/smithy-kotlin/issues/352
3838
traitList.add(RuntimeTypes.Serde.SerdeXml.XmlAliasName, serialName.toggleFirstCharacterCase().dq())
3939
}
4040
}

codegen/smithy-kotlin-codegen-testutils/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ publishing {
8686
}
8787
}
8888

89-
configurePublishing("smithy-kotlin")
89+
configurePublishing("smithy-kotlin", "smithy-lang")

codegen/smithy-kotlin-codegen/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ publishing {
122122
}
123123
}
124124

125-
configurePublishing("smithy-kotlin")
125+
configurePublishing("smithy-kotlin", "smithy-lang")

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/CodegenVisitor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class CodegenVisitor(context: PluginContext) : ShapeVisitor.Default<Unit>() {
6161
// Model pre-processing:
6262
// 1. Start with the model from the plugin context
6363
// 2. Apply integrations
64-
// 3. Flatten error shapes (see: https://github.com/awslabs/smithy/pull/919)
64+
// 3. Flatten error shapes (see: https://github.com/smithy-lang/smithy/pull/919)
6565
// 4. Normalize the operations
6666
for (integration in integrations) {
6767
if (integration.enabledForService(resolvedModel, settings)) {

0 commit comments

Comments
 (0)