chore: clean up prospective ktlint warnings about missing copyright headers and single-expression bodies (#859)

ianbotsf · web-flow · commit 3d0534b5f3f7 · 2023-02-24T13:55:08.000-08:00
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProvider.kt
@@ -137,18 +137,16 @@ public class ImdsCredentialsProvider(
         }
     }
 
-    private suspend fun loadProfile(): String {
-        return try {
-            client.value.get(CREDENTIALS_BASE_PATH)
-        } catch (ex: EC2MetadataError) {
-            if (ex.statusCode == HttpStatusCode.NotFound.value) {
-                coroutineContext.info<ImdsCredentialsProvider> {
-                    "Received 404 from IMDS when loading profile information. Hint: This instance may not have an " +
-                        "IAM role associated."
-                }
+    private suspend fun loadProfile() = try {
+        client.value.get(CREDENTIALS_BASE_PATH)
+    } catch (ex: EC2MetadataError) {
+        if (ex.statusCode == HttpStatusCode.NotFound.value) {
+            coroutineContext.info<ImdsCredentialsProvider> {
+                "Received 404 from IMDS when loading profile information. Hint: This instance may not have an " +
+                    "IAM role associated."
             }
-            throw ex
         }
+        throw ex
     }
 
     private suspend fun useCachedCredentials(ex: Exception): Credentials? = when {
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProcessCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProcessCredentialsProvider.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsWebIdentityCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsWebIdentityCredentialsProvider.kt
@@ -117,9 +117,9 @@ public class StsWebIdentityCredentialsProvider(
 }
 
 // convenience function to resolve parameters for fromEnvironment()
-private inline fun <reified T> PlatformProvider.resolve(explicit: T?, setting: AwsSdkSetting<T>, name: String): T {
-    return explicit ?: setting.resolve(this)
+private inline fun <reified T> PlatformProvider.resolve(explicit: T?, setting: AwsSdkSetting<T>, name: String): T =
+    explicit
+        ?: setting.resolve(this)
         ?: throw ProviderConfigurationException(
             "Required field `$name` could not be automatically inferred for StsWebIdentityCredentialsProvider. Either explicitly pass a value, set the environment variable `${setting.environmentVariable}`, or set the JVM system property `${setting.jvmProperty}`",
         )
-}
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/profile/AwsConfigLoader.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/profile/AwsConfigLoader.kt
@@ -42,13 +42,12 @@ public suspend fun loadActiveAwsProfile(platform: PlatformProvider): AwsProfile
  *
  * @return A map of all profiles, which each are a map of key/value pairs.
  */
-internal suspend fun loadAwsProfiles(platform: PlatformProvider, source: AwsConfigurationSource): Map<String, Map<String, String>> {
+internal suspend fun loadAwsProfiles(platform: PlatformProvider, source: AwsConfigurationSource) =
     // merged AWS configuration based on optional configuration and credential file contents
-    return mergeProfiles(
+    mergeProfiles(
         parse(FileType.CONFIGURATION, platform.readFileOrNull(source.configPath)?.decodeToString()),
         parse(FileType.CREDENTIAL, platform.readFileOrNull(source.credentialsPath)?.decodeToString()),
     )
-}
 
 // Merge contents of profile maps
 internal fun mergeProfiles(vararg maps: ProfileMap) = buildMap<String, Map<String, String>> {
diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProviderTest.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProviderTest.kt
@@ -604,14 +604,12 @@ class ImdsCredentialsProviderTest {
 
         // this engine just returns 500 errors
         val internalServerErrorEngine = object : HttpClientEngineBase("internalServerError") {
-            override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
-                return HttpCall(
-                    HttpRequest(HttpMethod.GET, Url(Scheme.HTTP, Host.parse("test"), Scheme.HTTP.defaultPort, "/path/foo/bar"), Headers.Empty, HttpBody.Empty),
-                    HttpResponse(HttpStatusCode.InternalServerError, Headers.Empty, HttpBody.Empty),
-                    testClock.now(),
-                    testClock.now(),
-                )
-            }
+            override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest) = HttpCall(
+                HttpRequest(HttpMethod.GET, Url(Scheme.HTTP, Host.parse("test"), Scheme.HTTP.defaultPort, "/path/foo/bar"), Headers.Empty, HttpBody.Empty),
+                HttpResponse(HttpStatusCode.InternalServerError, Headers.Empty, HttpBody.Empty),
+                testClock.now(),
+                testClock.now(),
+            )
         }
 
         val client = ImdsClient {
diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ProcessCredentialsProviderTest.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ProcessCredentialsProviderTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/config/AwsSdkSettingTest.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/config/AwsSdkSettingTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.config
 
 import aws.sdk.kotlin.runtime.config.retries.RetryMode
@@ -70,12 +74,11 @@ class AwsSdkSettingTest {
         assertEquals(expected, actual)
     }
 
-    private fun mockPlatform(env: Map<String, String>, jvmProps: Map<String, String>): PlatformEnvironProvider {
-        return object : PlatformEnvironProvider {
+    private fun mockPlatform(env: Map<String, String>, jvmProps: Map<String, String>) =
+        object : PlatformEnvironProvider {
             override fun getAllEnvVars(): Map<String, String> = env
             override fun getenv(key: String): String? = env[key]
             override fun getAllProperties(): Map<String, String> = jvmProps
             override fun getProperty(key: String): String? = jvmProps[key]
         }
-    }
 }
diff --git a/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/auth/credentials/SdkIOException.kt b/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/auth/credentials/SdkIOException.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.auth.credentials
 
 import java.io.IOException
diff --git a/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/auth/credentials/executeCommandJVM.kt b/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/auth/credentials/executeCommandJVM.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProviderException
diff --git a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactoryTest.kt b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactoryTest.kt
@@ -66,10 +66,7 @@ private interface TestClient : SdkClient {
 
     class Builder internal constructor() : AbstractSdkClientBuilder<Config, Config.Builder, TestClient>() {
         override val config: Config.Builder = Config.Builder()
-
-        override fun newClient(config: Config): TestClient {
-            return DefaultTestClient(config)
-        }
+        override fun newClient(config: Config): TestClient = DefaultTestClient(config)
     }
 
     class Config private constructor(builder: Config.Builder) : SdkClientConfig, AwsSdkClientConfig {
diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/AwsRetryHeaderMiddleware.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/AwsRetryHeaderMiddleware.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.http.middleware
 
 import aws.smithy.kotlin.runtime.InternalApi
diff --git a/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/AwsRetryHeaderMiddlewareTest.kt b/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/AwsRetryHeaderMiddlewareTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.http.middleware
 
 import aws.smithy.kotlin.runtime.http.Headers
diff --git a/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/retries/AwsDefaultRetryPolicyTest.kt b/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/retries/AwsDefaultRetryPolicyTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.runtime.http.retries
 
 import aws.smithy.kotlin.runtime.ServiceErrorMetadata
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/PresignerGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/PresignerGenerator.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen
 
 import aws.sdk.kotlin.codegen.model.traits.Presignable
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/BoxServices.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/BoxServices.kt
@@ -83,10 +83,10 @@ class BoxServices : KotlinIntegration {
     private val Shape.isPrimitiveShape: Boolean
         get() = isBooleanShape || isNumberShape
 
-    private fun <T> box(shape: T): Shape where T : Shape, T : ToSmithyBuilder<T> {
-        return (shape.toBuilder() as AbstractShapeBuilder<*, T>)
-            .addTrait(@Suppress("DEPRECATION") software.amazon.smithy.model.traits.BoxTrait()).build()
-    }
+    private fun <T> box(shape: T): Shape where T : Shape, T : ToSmithyBuilder<T> =
+        (shape.toBuilder() as AbstractShapeBuilder<*, T>)
+            .addTrait(@Suppress("DEPRECATION") software.amazon.smithy.model.traits.BoxTrait())
+            .build()
 
     private fun boxNumber(shape: NumberShape): Shape = when (shape) {
         is ByteShape -> box(shape)
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/PresignableOperations.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/PresignableOperations.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization
 
 import aws.sdk.kotlin.codegen.model.traits.Presignable
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/apigateway/ApiGatewayAddAcceptHeader.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/apigateway/ApiGatewayAddAcceptHeader.kt
@@ -28,7 +28,5 @@ class ApiGatewayAddAcceptHeader : KotlinIntegration {
     override fun customizeMiddleware(
         ctx: ProtocolGenerator.GenerationContext,
         resolved: List<ProtocolMiddleware>,
-    ): List<ProtocolMiddleware> {
-        return resolved + addAcceptHeaderMiddleware
-    }
+    ): List<ProtocolMiddleware> = resolved + addAcceptHeaderMiddleware
 }
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/flexiblechecksums/FlexibleChecksumsRequest.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/flexiblechecksums/FlexibleChecksumsRequest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.flexiblechecksums
 
 import software.amazon.smithy.aws.traits.HttpChecksumTrait
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/flexiblechecksums/FlexibleChecksumsResponse.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/flexiblechecksums/FlexibleChecksumsResponse.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.flexiblechecksums
 
 import software.amazon.smithy.aws.traits.HttpChecksumTrait
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAccountIdDefault.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAccountIdDefault.kt
@@ -27,9 +27,7 @@ class GlacierAccountIdDefault : KotlinIntegration {
     override fun customizeMiddleware(
         ctx: ProtocolGenerator.GenerationContext,
         resolved: List<ProtocolMiddleware>,
-    ): List<ProtocolMiddleware> {
-        return resolved + GlacierAccountIdMiddleware()
-    }
+    ): List<ProtocolMiddleware> = resolved + GlacierAccountIdMiddleware()
 }
 
 private class GlacierAccountIdMiddleware : ProtocolMiddleware {
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAddVersionHeader.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAddVersionHeader.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.glacier
 
 import aws.sdk.kotlin.codegen.protocols.middleware.MutateHeadersMiddleware
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/polly/PollyPresigner.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/polly/PollyPresigner.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.polly
 
 import aws.sdk.kotlin.codegen.AwsKotlinDependency
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/route53/TrimResourcePrefix.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/route53/TrimResourcePrefix.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.route53
 
 import aws.sdk.kotlin.codegen.sdkId
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/ClientConfigIntegration.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/ClientConfigIntegration.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3
 
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/ContinueIntegration.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/ContinueIntegration.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3
 
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/GetBucketLocationDeserializerIntegration.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/GetBucketLocationDeserializerIntegration.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3
 
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/HttpPathFilter.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/HttpPathFilter.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3
 
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3ErrorMetadataIntegration.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3ErrorMetadataIntegration.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3
 
 import aws.sdk.kotlin.codegen.AwsKotlinDependency
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3control/ClientConfigIntegration.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3control/ClientConfigIntegration.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3control
 
 import aws.sdk.kotlin.codegen.customization.s3.isS3Control
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3control/HostPrefixFilter.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3control/HostPrefixFilter.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3control
 
 import aws.sdk.kotlin.codegen.customization.s3.isS3Control
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/Presignable.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/Presignable.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.model.traits
 
 import software.amazon.smithy.model.node.Node
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/RestXml.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/RestXml.kt
@@ -16,6 +16,8 @@ import software.amazon.smithy.kotlin.codegen.rendering.serde.*
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.*
 import software.amazon.smithy.model.traits.*
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
 
 /**
  * Handles generating the aws.protocols#restJson1 protocol for services.
@@ -60,18 +62,16 @@ class RestXmlParserGenerator(
         writer: KotlinWriter,
     ): XmlSerdeDescriptorGenerator = RestXmlSerdeDescriptorGenerator(ctx.toRenderingContext(protocolGenerator, shape, writer), members)
 
+    @OptIn(ExperimentalContracts::class)
     override fun payloadDeserializer(
         ctx: ProtocolGenerator.GenerationContext,
         shape: Shape,
         members: Collection<MemberShape>?,
-    ): Symbol {
-        return if (shape.hasTrait<XmlNameTrait>() && shape is MemberShape) {
-            // can't delegate, have to generate a dedicated deserializer because the member xml name is different
-            // from the name of the target shape
-            explicitBoundStructureDeserializer(ctx, shape)
-        } else {
-            super.payloadDeserializer(ctx, shape, members)
-        }
+    ): Symbol = when {
+        // can't delegate, have to generate a dedicated deserializer because the member xml name is different
+        // from the name of the target shape
+        isXmlNamedMemberShape(shape) -> explicitBoundStructureDeserializer(ctx, shape)
+        else -> super.payloadDeserializer(ctx, shape, members)
     }
 
     private fun explicitBoundStructureDeserializer(
@@ -118,18 +118,16 @@ class RestXmlSerializerGenerator(
         writer: KotlinWriter,
     ): XmlSerdeDescriptorGenerator = RestXmlSerdeDescriptorGenerator(ctx.toRenderingContext(protocolGenerator, shape, writer), members)
 
+    @OptIn(ExperimentalContracts::class)
     override fun payloadSerializer(
         ctx: ProtocolGenerator.GenerationContext,
         shape: Shape,
         members: Collection<MemberShape>?,
-    ): Symbol {
-        return if (shape.hasTrait<XmlNameTrait>() && shape is MemberShape) {
-            // can't delegate, have to generate a dedicated serializer because the member xml name is different
-            // from the name of the target shape
-            explicitBoundStructureSerializer(ctx, shape)
-        } else {
-            super.payloadSerializer(ctx, shape, members)
-        }
+    ): Symbol = when {
+        // can't delegate, have to generate a dedicated serializer because the member xml name is different
+        // from the name of the target shape
+        isXmlNamedMemberShape(shape) -> explicitBoundStructureSerializer(ctx, shape)
+        else -> super.payloadSerializer(ctx, shape, members)
     }
 
     private fun explicitBoundStructureSerializer(
@@ -165,3 +163,11 @@ class RestXmlSerializerGenerator(
         }
     }
 }
+
+@ExperimentalContracts
+private fun isXmlNamedMemberShape(shape: Shape): Boolean {
+    contract {
+        returns(true) implies (shape is MemberShape)
+    }
+    return shape.hasTrait<XmlNameTrait>() && shape is MemberShape
+}
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/QueryHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/QueryHttpBindingProtocolGenerator.kt
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/PresignerGeneratorTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/PresignerGeneratorTest.kt
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/PresignableModelIntegrationTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/PresignableModelIntegrationTest.kt
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/s3/ContinueIntegrationTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/s3/ContinueIntegrationTest.kt
diff --git a/gradle/sdk-plugins/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/CodegenPlugin.kt b/gradle/sdk-plugins/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/CodegenPlugin.kt
diff --git a/services/polly/common/test/aws/sdk/kotlin/services/polly/PollyTest.kt b/services/polly/common/test/aws/sdk/kotlin/services/polly/PollyTest.kt
diff --git a/services/polly/e2eTest/src/PollyPresignerTest.kt b/services/polly/e2eTest/src/PollyPresignerTest.kt
diff --git a/services/s3/common/src/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializer.kt b/services/s3/common/src/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializer.kt
diff --git a/services/s3/e2eTest/src/S3PresignerTest.kt b/services/s3/e2eTest/src/S3PresignerTest.kt
diff --git a/services/sts/e2eTest/src/STSPresignerTest.kt b/services/sts/e2eTest/src/STSPresignerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -137,18 +137,16 @@ public class ImdsCredentialsProvider(`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- private suspend fun loadProfile(): String {`
`141`		`- return try {`
`142`		`- client.value.get(CREDENTIALS_BASE_PATH)`
`143`		`- } catch (ex: EC2MetadataError) {`
`144`		`- if (ex.statusCode == HttpStatusCode.NotFound.value) {`
`145`		`- coroutineContext.info<ImdsCredentialsProvider> {`
`146`		`- "Received 404 from IMDS when loading profile information. Hint: This instance may not have an " +`
`147`		`- "IAM role associated."`
`148`		`- }`
	`140`	`+ private suspend fun loadProfile() = try {`
	`141`	`+ client.value.get(CREDENTIALS_BASE_PATH)`
	`142`	`+ } catch (ex: EC2MetadataError) {`
	`143`	`+ if (ex.statusCode == HttpStatusCode.NotFound.value) {`
	`144`	`+ coroutineContext.info<ImdsCredentialsProvider> {`
	`145`	`+ "Received 404 from IMDS when loading profile information. Hint: This instance may not have an " +`
	`146`	`+ "IAM role associated."`
`149`	`147`	`}`
`150`		`- throw ex`
`151`	`148`	`}`
	`149`	`+ throw ex`
`152`	`150`	`}`
`153`	`151`
`154`	`152`	`private suspend fun useCachedCredentials(ex: Exception): Credentials? = when {`
Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,9 @@ public class StsWebIdentityCredentialsProvider(`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`// convenience function to resolve parameters for fromEnvironment()`
`120`		`-private inline fun <reified T> PlatformProvider.resolve(explicit: T?, setting: AwsSdkSetting<T>, name: String): T {`
`121`		`- return explicit ?: setting.resolve(this)`
	`120`	`+private inline fun <reified T> PlatformProvider.resolve(explicit: T?, setting: AwsSdkSetting<T>, name: String): T =`
	`121`	`+ explicit`
	`122`	`+ ?: setting.resolve(this)`
`122`	`123`	`?: throw ProviderConfigurationException(`
`123`	`124`	"Required field `$name` could not be automatically inferred for StsWebIdentityCredentialsProvider. Either explicitly pass a value, set the environment variable `${setting.environmentVariable}`, or set the JVM system property `${setting.jvmProperty}`",
`124`	`125`	`)`
`125`		`-}`