fix: remove unnecessary protocol conformance (#404)

kneekey23 · web-flow · commit 158bf515207b · 2022-02-09T16:22:00.000-08:00
diff --git a/Packages/ClientRuntime/Sources/Middleware/OperationStack.swift b/Packages/ClientRuntime/Sources/Middleware/OperationStack.swift
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0.
 
-public struct OperationStack<OperationStackInput: Encodable & Reflection,
+public struct OperationStack<OperationStackInput,
                              OperationStackOutput: HttpResponseBinding,
                              OperationStackError: HttpResponseBinding> {
     
diff --git a/Packages/ClientRuntime/Sources/Middleware/Steps/InitializeStep.swift b/Packages/ClientRuntime/Sources/Middleware/Steps/InitializeStep.swift
@@ -7,7 +7,7 @@
 /// Takes Input Parameters, and returns result or error.
 ///
 /// Receives result or error from Serialize step.
-public typealias InitializeStep<I: Encodable & Reflection,
+public typealias InitializeStep<I,
                                 O: HttpResponseBinding,
                                 E: HttpResponseBinding> = MiddlewareStep<HttpContext,
                                                                          I,
@@ -16,7 +16,7 @@ public typealias InitializeStep<I: Encodable & Reflection,
 
 public let InitializeStepId = "Initialize"
 
-public struct InitializeStepHandler<OperationStackInput: Encodable & Reflection,
+public struct InitializeStepHandler<OperationStackInput,
                                     OperationStackOutput: HttpResponseBinding,
                                     OperationStackError: HttpResponseBinding,
                                     H: Handler>: Handler where H.Context == HttpContext,
diff --git a/Packages/ClientRuntime/Sources/Middleware/Steps/SerializeStep.swift b/Packages/ClientRuntime/Sources/Middleware/Steps/SerializeStep.swift
@@ -7,7 +7,7 @@
 /// Converts Input Parameters into a Request, and returns the result or error.
 ///
 /// Receives result or error from Build step.
-public typealias SerializeStep<I: Encodable & Reflection,
+public typealias SerializeStep<I,
                                O: HttpResponseBinding,
                                E: HttpResponseBinding> = MiddlewareStep<HttpContext,
                                                                         SerializeStepInput<I>,
@@ -16,7 +16,7 @@ public typealias SerializeStep<I: Encodable & Reflection,
 
 public let SerializeStepId = "Serialize"
 
-public struct SerializeStepHandler<OperationStackInput: Encodable & Reflection,
+public struct SerializeStepHandler<OperationStackInput,
                                    OperationStackOutput: HttpResponseBinding,
                                    OperationStackError: HttpResponseBinding,
                                    H: Handler>: Handler where H.Context == HttpContext,
@@ -41,7 +41,7 @@ public struct SerializeStepHandler<OperationStackInput: Encodable & Reflection,
     }
 }
 
-public struct SerializeStepInput<OperationStackInput: Encodable & Reflection> {
+public struct SerializeStepInput<OperationStackInput> {
     public let operationInput: OperationStackInput
     public let builder: SdkHttpRequestBuilder = SdkHttpRequestBuilder()
 }
diff --git a/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/ContentTypeMiddleware.swift b/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/ContentTypeMiddleware.swift
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0.
 
-public struct ContentTypeMiddleware<OperationStackInput: Encodable & Reflection,
+public struct ContentTypeMiddleware<OperationStackInput,
                                     OperationStackOutput: HttpResponseBinding,
                                     OperationStackError: HttpResponseBinding>: Middleware {
 
diff --git a/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/HeaderMiddleware.swift b/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/HeaderMiddleware.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct HeaderMiddleware<OperationStackInput: Encodable & Reflection & HeaderProvider,
+public struct HeaderMiddleware<OperationStackInput: HeaderProvider,
                                OperationStackOutput: HttpResponseBinding,
                                OperationStackError: HttpResponseBinding>: Middleware {
     public let id: String = "\(String(describing: OperationStackInput.self))HeadersMiddleware"
diff --git a/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/QueryItemMiddleware.swift b/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/QueryItemMiddleware.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct QueryItemMiddleware<OperationStackInput: Encodable & Reflection & QueryItemProvider,
+public struct QueryItemMiddleware<OperationStackInput: QueryItemProvider,
                                   OperationStackOutput: HttpResponseBinding,
                                   OperationStackError: HttpResponseBinding>: Middleware {
     public let id: String = "\(String(describing: OperationStackInput.self))QueryItemMiddleware"
diff --git a/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/URLHostMiddleware.swift b/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/URLHostMiddleware.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct URLHostMiddleware<OperationStackInput: Encodable & Reflection,
+public struct URLHostMiddleware<OperationStackInput,
                                 OperationStackOutput: HttpResponseBinding,
                                 OperationStackError: HttpResponseBinding>: Middleware {
     public let id: String = "\(String(describing: OperationStackInput.self))URLHostMiddleware"
diff --git a/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/URLPathMiddleware.swift b/Packages/ClientRuntime/Sources/Networking/Http/Middlewares/URLPathMiddleware.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct URLPathMiddleware<OperationStackInput: Encodable & Reflection & URLPathProvider,
+public struct URLPathMiddleware<OperationStackInput: URLPathProvider,
                                 OperationStackOutput: HttpResponseBinding,
                                 OperationStackError: HttpResponseBinding>: ClientRuntime.Middleware {
     public let id: Swift.String = "\(String(describing: OperationStackInput.self))URLPathMiddleware"
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt
@@ -149,8 +149,6 @@ class StructureGenerator(
                     writer.write("self.\$1L = \$1L", memberName)
                 }
             }
-        } else {
-            writer.write("public init() {}")
         }
     }
 
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpBindingProtocolGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpBindingProtocolGenerator.kt
@@ -149,15 +149,22 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             val httpBodyMembers = shape.members()
                 .filter { it.isInHttpBody() }
                 .toList()
-            ctx.delegator.useShapeWriter(encodeSymbol) { writer ->
-                writer.openBlock("extension $symbolName: \$N, \$N {", "}", SwiftTypes.Protocols.Encodable, ClientRuntimeTypes.Core.Reflection) {
-                    writer.addImport(SwiftDependency.CLIENT_RUNTIME.target)
-
-                    if (shouldRenderCodingKeysForEncodable) {
-                        generateCodingKeysForMembers(ctx, writer, httpBodyMembers)
-                        writer.write("")
+            if (httpBodyMembers.isNotEmpty() || shouldRenderEncodableConformance) {
+                ctx.delegator.useShapeWriter(encodeSymbol) { writer ->
+                    writer.openBlock(
+                        "extension $symbolName: \$N, \$N {",
+                        "}",
+                        SwiftTypes.Protocols.Encodable,
+                        ClientRuntimeTypes.Core.Reflection
+                    ) {
+                        writer.addImport(SwiftDependency.CLIENT_RUNTIME.target)
+
+                        if (shouldRenderCodingKeysForEncodable) {
+                            generateCodingKeysForMembers(ctx, writer, httpBodyMembers)
+                            writer.write("")
+                        }
+                        renderStructEncode(ctx, shape, shapeMetadata, httpBodyMembers, writer, defaultTimestampFormat)
                     }
-                    renderStructEncode(ctx, shape, shapeMetadata, httpBodyMembers, writer, defaultTimestampFormat)
                 }
             }
             if (shouldRenderDecodableBodyStructForInputShapes && httpBodyMembers.isNotEmpty()) {
@@ -173,9 +180,12 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
         httpResponseGenerator.render(ctx, httpOperations, httpBindingResolver)
 
         val outputShapesWithMetadata = resolveOutputShapes(ctx)
+
         for ((shape, metadata) in outputShapesWithMetadata) {
-            renderBodyStructAndDecodableExtension(ctx, shape, metadata)
-            DynamicNodeDecodingGeneratorStrategy(ctx, shape, isForBodyStruct = true).renderIfNeeded()
+            if (shape.members().any { it.isInHttpBody() }) {
+                renderBodyStructAndDecodableExtension(ctx, shape, metadata)
+                DynamicNodeDecodingGeneratorStrategy(ctx, shape, isForBodyStruct = true).renderIfNeeded()
+            }
         }
 
         val errorShapes = resolveErrorShapes(ctx)
@@ -410,6 +420,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
     protected abstract val httpResponseGenerator: HttpResponseGeneratable
     protected abstract val shouldRenderDecodableBodyStructForInputShapes: Boolean
     protected abstract val shouldRenderCodingKeysForEncodable: Boolean
+    protected abstract val shouldRenderEncodableConformance: Boolean
     protected abstract fun renderStructEncode(
         ctx: ProtocolGenerator.GenerationContext,
         shapeContainingMembers: Shape,
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/HttpResponseBindingOutputGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/HttpResponseBindingOutputGenerator.kt
@@ -43,7 +43,12 @@ class HttpResponseBindingOutputGenerator(
         ctx.delegator.useShapeWriter(httpBindingSymbol) { writer ->
             writer.addImport(SwiftDependency.CLIENT_RUNTIME.target)
             writer.openBlock("extension $outputShapeName: \$N {", "}", ClientRuntimeTypes.Http.HttpResponseBinding) {
-                writer.openBlock("public init (httpResponse: \$N, decoder: \$D) throws {", "}", ClientRuntimeTypes.Http.HttpResponse, ClientRuntimeTypes.Serde.ResponseDecoder) {
+                writer.openBlock(
+                    "public init (httpResponse: \$N, decoder: \$D) throws {",
+                    "}",
+                    ClientRuntimeTypes.Http.HttpResponse,
+                    ClientRuntimeTypes.Serde.ResponseDecoder
+                ) {
                     HttpResponseHeaders(ctx, headerBindings, defaultTimestampFormat, writer).render()
                     HttpResponsePrefixHeaders(ctx, responseBindings, writer).render()
                     HttpResponseTraitPayload(ctx, responseBindings, outputShapeName, writer).render()
diff --git a/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpAWSJson11ProtocolGenerator.kt b/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpAWSJson11ProtocolGenerator.kt
@@ -78,6 +78,7 @@ class MockHttpAWSJson11ProtocolGenerator : HttpBindingProtocolGenerator() {
     )
     override val shouldRenderDecodableBodyStructForInputShapes = true
     override val shouldRenderCodingKeysForEncodable = true
+    override val shouldRenderEncodableConformance = false
 
     override fun renderStructEncode(
         ctx: ProtocolGenerator.GenerationContext,
diff --git a/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpEC2QueryProtocolGenerator.kt b/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpEC2QueryProtocolGenerator.kt
@@ -76,6 +76,7 @@ class MockHttpEC2QueryProtocolGenerator : HttpBindingProtocolGenerator() {
     )
     override val shouldRenderDecodableBodyStructForInputShapes = false
     override val shouldRenderCodingKeysForEncodable = false
+    override val shouldRenderEncodableConformance = true
     override fun renderStructEncode(
         ctx: ProtocolGenerator.GenerationContext,
         shapeContainingMembers: Shape,
diff --git a/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpRestJsonProtocolGenerator.kt b/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpRestJsonProtocolGenerator.kt
@@ -68,6 +68,7 @@ class MockHttpRestJsonProtocolGenerator : HttpBindingProtocolGenerator() {
     )
     override val shouldRenderDecodableBodyStructForInputShapes = true
     override val shouldRenderCodingKeysForEncodable = true
+    override val shouldRenderEncodableConformance = false
 
     override fun renderStructEncode(
         ctx: ProtocolGenerator.GenerationContext,
diff --git a/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpRestXMLProtocolGenerator.kt b/smithy-swift-codegen/src/test/kotlin/mocks/MockHttpRestXMLProtocolGenerator.kt
@@ -45,6 +45,7 @@ class MockHttpRestXMLProtocolGenerator : HttpBindingProtocolGenerator() {
     )
     override val shouldRenderDecodableBodyStructForInputShapes = true
     override val shouldRenderCodingKeysForEncodable = true
+    override val shouldRenderEncodableConformance = false
 
     override fun renderStructEncode(
         ctx: ProtocolGenerator.GenerationContext,

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,6 @@ class StructureGenerator(`
`149`	`149`	`writer.write("self.\$1L = \$1L", memberName)`
`150`	`150`	`}`
`151`	`151`	`}`
`152`		`- } else {`
`153`		`- writer.write("public init() {}")`
`154`	`152`	`}`
`155`	`153`	`}`
`156`	`154`