content type and accept type

Author: luigi

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

@@ -40,6 +40,7 @@ class RestJson1 : JsonHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         super.renderSerializeHttpBody(ctx, op, writer)
+        if (ctx.settings.build.generateServiceProject) return
 
         val resolver = getProtocolHttpBindingResolver(ctx.model, ctx.service)
         if (!resolver.hasHttpBody(op)) return

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -558,6 +558,9 @@ object RuntimeTypes {
         val HttpHeaders = symbol("HttpHeaders")
         val Cbor = symbol("Cbor", "ContentType.Application")
         val Json = symbol("Json", "ContentType.Application")
+        val Any = symbol("Any", "ContentType.Application")
+        val OctetStream = symbol("OctetStream", "ContentType.Application")
+        val PlainText = symbol("Plain", "ContentType.Text")
     }
 
     object KtorServerLogging : RuntimeTypePackage(KotlinDependency.KTOR_SERVER_LOGGING) {

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/KtorStubGenerator.kt

@@ -208,8 +208,6 @@ internal class KtorStubGenerator(
 
     // Writes `Routing.kt` that maps Smithy operations → Ktor routes.
     override fun renderRouting() {
-        val contentType = ContentType.fromServiceShape(serviceShape)
-
         delegator.useFileWriter("Routing.kt", ctx.settings.pkg.name) { writer ->
 
             operations.forEach { shape ->
@@ -241,15 +239,27 @@ internal class KtorStubGenerator(
                                 "OPTIONS" -> RuntimeTypes.KtorServerRouting.options
                                 else -> error("Unsupported http trait ${httpTrait.method}")
                             }
-
+                            val contentType = ContentType.fromServiceShape(ctx, serviceShape, shape)
                             val contentTypeGuard = when (contentType) {
                                 ContentType.CBOR -> "cbor()"
                                 ContentType.JSON -> "json()"
+                                ContentType.PLAIN_TEXT -> "text()"
+                                ContentType.BINARY -> "binary()"
+                                ContentType.MEDIA_TYPE -> "any()"
+                            }
+
+                            val acceptTypeGuard = when (contentType) {
+                                ContentType.CBOR -> "cbor()"
+                                ContentType.JSON,
+                                ContentType.PLAIN_TEXT,
+                                ContentType.BINARY,
+                                ContentType.MEDIA_TYPE,
+                                -> "json()"
                             }
 
                             withBlock("#T (#S) {", "}", RuntimeTypes.KtorServerRouting.route, uri) {
                                 write("#T(#T) { $contentTypeGuard }", RuntimeTypes.KtorServerCore.install, ServiceTypes(pkgName).contentTypeGuard)
-                                write("#T(#T) { $contentTypeGuard }", RuntimeTypes.KtorServerCore.install, ServiceTypes(pkgName).acceptTypeGuard)
+                                write("#T(#T) { $acceptTypeGuard }", RuntimeTypes.KtorServerCore.install, ServiceTypes(pkgName).acceptTypeGuard)
                                 withBlock(
                                     "#W",
                                     "}",
@@ -400,7 +410,11 @@ internal class KtorStubGenerator(
                     RuntimeTypes.KtorServerHttp.HttpStatusCode,
                 )
             }
-            ContentType.JSON -> w.withBlock(
+            ContentType.JSON,
+            ContentType.PLAIN_TEXT,
+            ContentType.BINARY,
+            ContentType.MEDIA_TYPE,
+            -> w.withBlock(
                 "#T.#T(",
                 ")",
                 RuntimeTypes.KtorServerCore.applicationCall,
@@ -535,13 +549,25 @@ internal class KtorStubGenerator(
             writer.withBlock("public class ContentTypeGuardConfig {", "}") {
                 write("public var allow: List<#T> = emptyList()", RuntimeTypes.KtorServerHttp.ContentType)
                 write("")
+                withBlock("public fun any(): Unit {", "}") {
+                    write("allow = listOf(#T)", RuntimeTypes.KtorServerHttp.Any)
+                }
+                write("")
                 withBlock("public fun json(): Unit {", "}") {
                     write("allow = listOf(#T)", RuntimeTypes.KtorServerHttp.Json)
                 }
                 write("")
                 withBlock("public fun cbor(): Unit {", "}") {
                     write("allow = listOf(#T)", RuntimeTypes.KtorServerHttp.Cbor)
                 }
+                write("")
+                withBlock("public fun text(): Unit {", "}") {
+                    write("allow = listOf(#T)", RuntimeTypes.KtorServerHttp.PlainText)
+                }
+                write("")
+                withBlock("public fun binary(): Unit {", "}") {
+                    write("allow = listOf(#T)", RuntimeTypes.KtorServerHttp.OctetStream)
+                }
             }
                 .write("")
 

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/ServiceStubConfigurations.kt

@@ -4,12 +4,19 @@ import software.amazon.smithy.aws.traits.protocols.RestJson1Trait
 import software.amazon.smithy.build.FileManifest
 import software.amazon.smithy.kotlin.codegen.core.GenerationContext
 import software.amazon.smithy.kotlin.codegen.core.KotlinDelegator
+import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
+import software.amazon.smithy.model.shapes.ShapeType
+import software.amazon.smithy.model.traits.HttpPayloadTrait
+import software.amazon.smithy.model.traits.MediaTypeTrait
 import software.amazon.smithy.protocol.traits.Rpcv2CborTrait
 
 enum class ContentType(val value: String) {
     CBOR("CBOR"),
     JSON("JSON"),
+    PLAIN_TEXT("PLAIN_TEXT"),
+    BINARY("BINARY"),
+    MEDIA_TYPE("MEDIA_TYPE"),
     ;
 
     override fun toString(): String = value
@@ -20,10 +27,34 @@ enum class ContentType(val value: String) {
             .firstOrNull { it.name.equals(value.uppercase(), ignoreCase = true) }
             ?: throw IllegalArgumentException("$value is not a validContentType value, expected one of ${ContentType.entries}")
 
-        fun fromServiceShape(shape: ServiceShape): ContentType = when {
-            shape.hasTrait(Rpcv2CborTrait.ID) -> CBOR
-            shape.hasTrait(RestJson1Trait.ID) -> JSON
-            else -> throw IllegalArgumentException("service shape does not a valid protocol")
+        fun fromServiceShape(ctx: GenerationContext, shape: ServiceShape, operation: OperationShape): ContentType {
+            return when {
+                shape.hasTrait(Rpcv2CborTrait.ID) -> CBOR
+                shape.hasTrait(RestJson1Trait.ID) -> {
+                    println(shape.allMembers)
+                    val inputShape = ctx.model.expectShape(operation.input.get())
+                    for (memberShape in inputShape.allMembers.values) {
+                        println("------------------------------")
+                        println(memberShape)
+                        if (!memberShape.hasTrait(HttpPayloadTrait.ID)) continue
+                        val memberType = ctx.model.expectShape(memberShape.target).type
+                        println(memberType)
+                        when (memberType) {
+                            ShapeType.STRING -> return PLAIN_TEXT
+                            ShapeType.DOCUMENT,
+                            ShapeType.STRUCTURE,
+                            ShapeType.UNION,
+                            -> return JSON
+                            else -> {
+                                if (memberShape.hasTrait(MediaTypeTrait.ID)) return MEDIA_TYPE
+                            }
+                        }
+                    }
+                    return JSON
+                }
+
+                else -> throw IllegalArgumentException("service shape does not a valid protocol")
+            }
         }
     }
 }