Revert "chore: reduce number of extensions to speed up builds (#151)" (#157)

This reverts commit 603e181.

Author: wooj2

AWSClientRuntime/Sources/Http/AWSUserAgentMetadata.swift

@@ -25,7 +25,7 @@ public struct AWSUserAgentMetadata {
     ///     (framework-metadata RWS)
     ///     [appId]
     var xAmzUserAgent: String {
-        // TODO: add feat-metadata, config-metadata, framework-metadata (Amplify?) and appId
+        //TODO: add feat-metadata, config-metadata, framework-metadata (Amplify?) and appId
         guard let executionEnvMetadata = executionEnvMetadata else {
             return "\(sdkMetadata) \(apiMetadata) \(osMetadata) \(languageMetadata)"
         }
@@ -51,7 +51,7 @@ public struct AWSUserAgentMetadata {
 
     public static func fromEnv(apiMetadata: APIMetadata) -> AWSUserAgentMetadata {
         let sdkMetadata = SDKMetadata(name: "swift", version: apiMetadata.version)
-        // TODO: figure out a better way to get both current OS and version of that OS
+        //TODO: figure out a better way to get both current OS and version of that OS
         let osMetadata = OSMetadata(family: currentOS, version: nil)
         let langMetadata = LanguageMetadata(version: swiftVersion)
         return AWSUserAgentMetadata(sdkMetadata: sdkMetadata,

AWSClientRuntime/Sources/Middlewares/RetrierMiddleware.swift

@@ -57,7 +57,7 @@ public struct RetrierMiddleware<Output: HttpResponseBinding,
             if retrier.isErrorRetryable(error: error) {
                 let errorType = retrier.getErrorType(error: error)
                 let newToken = try retrier.scheduleRetry(token: token, error: errorType)
-                // TODO: rewind the stream once streaming is properly implemented
+                //TODO: rewind the stream once streaming is properly implemented
                 return try tryRequest(token: newToken, partitionId: partitionId, context: context, input: input, next: next)
             } else {
                 return serviceResponse

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/awsjson/AWSJsonHttpResponseBindingErrorGenerator.kt

@@ -17,7 +17,7 @@ class AWSJsonHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGenerat
         val operationErrorName = "${op.capitalizedName()}OutputError"
         val rootNamespace = ctx.settings.moduleName
         val httpBindingSymbol = Symbol.builder()
-            .definitionFile("./$rootNamespace/models/$operationErrorName+Extensions.swift")
+            .definitionFile("./$rootNamespace/models/$operationErrorName+HttpResponseBinding.swift")
             .name(operationErrorName)
             .build()
 

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/ec2query/httpResponse/AWSEc2QueryHttpResponseBindingErrorGenerator.kt

@@ -13,7 +13,7 @@ class AWSEc2QueryHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGen
         val operationErrorName = "${op.capitalizedName()}OutputError"
         val rootNamespace = ctx.settings.moduleName
         val httpBindingSymbol = Symbol.builder()
-            .definitionFile("./$rootNamespace/models/$operationErrorName+Extensions.swift")
+            .definitionFile("./$rootNamespace/models/$operationErrorName+HttpResponseBinding.swift")
             .name(operationErrorName)
             .build()
 

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/restjson/AWSRestJson1HttpResponseBindingErrorGeneratable.kt

@@ -13,7 +13,7 @@ class AWSRestJson1HttpResponseBindingErrorGeneratable : HttpResponseBindingError
         val operationErrorName = "${op.capitalizedName()}OutputError"
         val rootNamespace = ctx.settings.moduleName
         val httpBindingSymbol = Symbol.builder()
-            .definitionFile("./$rootNamespace/models/$operationErrorName+Extensions.swift")
+            .definitionFile("./$rootNamespace/models/$operationErrorName+HttpResponseBinding.swift")
             .name(operationErrorName)
             .build()
 

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/restxml/AWSRestXMLHttpResponseBindingErrorGenerator.kt

@@ -13,7 +13,7 @@ class AWSRestXMLHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGene
         val operationErrorName = "${op.capitalizedName()}OutputError"
         val rootNamespace = ctx.settings.moduleName
         val httpBindingSymbol = Symbol.builder()
-            .definitionFile("./$rootNamespace/models/$operationErrorName+Extensions.swift")
+            .definitionFile("./$rootNamespace/models/$operationErrorName+HttpResponseBinding.swift")
             .name(operationErrorName)
             .build()
 

codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/RestJsonProtocolGeneratorTests.kt

@@ -18,7 +18,7 @@ class RestJsonProtocolGeneratorTests {
     @Test
     fun `define coding keys for unbound document payload members`() {
         val context = setupTests("http-binding-protocol-generator-test.smithy", "com.test#Example")
-        val contents = getModelFileContents("Example", "SmokeTestInput+Extensions.swift", context.manifest)
+        val contents = getModelFileContents("Example", "SmokeTestInput+Encodable.swift", context.manifest)
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """
@@ -49,7 +49,7 @@ class RestJsonProtocolGeneratorTests {
     @Test
     fun `define coding keys for payload member`() {
         val context = setupTests("http-binding-protocol-generator-test.smithy", "com.test#Example")
-        val contents = getModelFileContents("Example", "ExplicitBlobInput+Extensions.swift", context.manifest)
+        val contents = getModelFileContents("Example", "ExplicitBlobInput+Encodable.swift", context.manifest)
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """

codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/ec2query/Ec2QueryHttpResponseBindingErrorGeneratorTests.kt

@@ -28,7 +28,7 @@ class Ec2QueryHttpResponseBindingErrorGeneratorTests {
     @Test
     fun `002 GreetingWithErrorsOutputError+HttpResponseBinding has with correct cases`() {
         val context = setupTests("ec2query/query-error.smithy", "aws.protocoltests.ec2#AwsEc2")
-        val contents = TestContextGenerator.getFileContents(context.manifest, "/Example/models/GreetingWithErrorsOutputError+Extensions.swift")
+        val contents = TestContextGenerator.getFileContents(context.manifest, "/Example/models/GreetingWithErrorsOutputError+HttpResponseBinding.swift")
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """

codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/restxml/AWSRestXMLHttpResponseBindingErrorGeneratorTests.kt

@@ -29,7 +29,7 @@ class AWSRestXMLHttpResponseBindingErrorGeneratorTests {
     @Test
     fun `002 GreetingWithErrorsOutputError+HttpResponseBinding`() {
         val context = setupTests("restxml/xml-errors.smithy", "aws.protocoltests.restxml#RestXml")
-        val contents = getFileContents(context.manifest, "/Example/models/GreetingWithErrorsOutputError+Extensions.swift")
+        val contents = getFileContents(context.manifest, "/Example/models/GreetingWithErrorsOutputError+HttpResponseBinding.swift")
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """