Merge pull request #1 from papsign/master

Update from original

Author: Javuto2

build.gradle

@@ -12,21 +12,21 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "ch.qos.logback:logback-classic:$logback_version"
+    implementation "org.slf4j:slf4j-api:$slf4j_version"
     implementation "io.ktor:ktor-server-core:$ktor_version"
     implementation "io.ktor:ktor-server-host-common:$ktor_version"
     implementation "io.ktor:ktor-metrics:$ktor_version"
     implementation "io.ktor:ktor-server-sessions:$ktor_version"
-    
+
     implementation "io.ktor:ktor-jackson:$ktor_version" // needed for parameter parsing and multipart parsing
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" // needed for multipart parsing
     implementation 'org.webjars:swagger-ui:3.25.0'
- 
+
     implementation "org.reflections:reflections:0.9.11" // only used while initializing
-    
+
     testImplementation "io.ktor:ktor-server-netty:$ktor_version"
     testImplementation "io.ktor:ktor-server-test-host:$ktor_version"
-    
+    testImplementation "ch.qos.logback:logback-classic:$logback_version"
 }
 
 compileKotlin {

gradle.properties

@@ -1,4 +1,5 @@
 kotlin.code.style=official
 ktor_version=1.3.2
 logback_version=1.2.1
+slf4j_version=1.7.30
 kotlin_version=1.3.70

src/main/kotlin/com/papsign/ktor/openapigen/KTypeUtil.kt

@@ -1,27 +1,24 @@
 package com.papsign.ktor.openapigen
 
-import com.papsign.ktor.openapigen.annotations.mapping.openAPIName
-import java.lang.reflect.Field
 import kotlin.reflect.*
 import kotlin.reflect.full.createType
-import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.javaField
 import kotlin.reflect.jvm.jvmErasure
 
 val unitKType = getKType<Unit>()
 
-inline fun <reified T> isNullable(): Boolean {
+internal inline fun <reified T> isNullable(): Boolean {
     return null is T
 }
 
-inline fun <reified T> getKType() = typeOf<T>()
+@PublishedApi
+internal inline fun <reified T> getKType() = typeOf<T>()
 
-fun KType.strip(nullable: Boolean = isMarkedNullable): KType {
+internal fun KType.strip(nullable: Boolean = isMarkedNullable): KType {
     return jvmErasure.createType(arguments, nullable)
 }
 
-fun KType.deepStrip(nullable: Boolean = isMarkedNullable): KType {
+internal fun KType.deepStrip(nullable: Boolean = isMarkedNullable): KType {
     return jvmErasure.createType(arguments.map { it.copy(type = it.type?.deepStrip()) }, nullable)
 }
 
@@ -44,4 +41,4 @@ val KType.memberProperties: List<KTypeProperty>
         }
     }
 
-val KClass<*>.isInterface get() = java.isInterface
+internal val KClass<*>.isInterface get() = java.isInterface

src/main/kotlin/com/papsign/ktor/openapigen/content/type/BodyParser.kt

@@ -3,10 +3,9 @@ package com.papsign.ktor.openapigen.content.type
 import io.ktor.application.ApplicationCall
 import io.ktor.http.ContentType
 import io.ktor.util.pipeline.PipelineContext
-import kotlin.reflect.KClass
 import kotlin.reflect.KType
 
 interface BodyParser: ContentTypeProvider {
-    fun <T: Any> getParseableContentTypes(clazz: KClass<T>): List<ContentType>
+    fun <T: Any> getParseableContentTypes(type: KType): List<ContentType>
     suspend fun <T: Any> parseBody(clazz: KType, request: PipelineContext<Unit, ApplicationCall>): T
 }

src/main/kotlin/com/papsign/ktor/openapigen/content/type/ResponseSerializer.kt

@@ -4,13 +4,13 @@ import io.ktor.application.ApplicationCall
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.util.pipeline.PipelineContext
-import kotlin.reflect.KClass
+import kotlin.reflect.KType
 
 interface ResponseSerializer: ContentTypeProvider {
     /**
      * used to determine which registered response serializer is used, based on the accept header
      */
-    fun <T: Any> getSerializableContentTypes(clazz: KClass<T>): List<ContentType>
+    fun <T: Any> getSerializableContentTypes(type: KType): List<ContentType>
     suspend fun <T: Any> respond(response: T, request: PipelineContext<Unit, ApplicationCall>, contentType: ContentType)
     suspend fun <T: Any> respond(statusCode: HttpStatusCode, response: T, request: PipelineContext<Unit, ApplicationCall>, contentType: ContentType)
 }

src/main/kotlin/com/papsign/ktor/openapigen/content/type/binary/BinaryContentTypeParser.kt

@@ -29,12 +29,12 @@ object BinaryContentTypeParser: BodyParser, ResponseSerializer, OpenAPIGenModule
         return constructors.first { it.parameters.size == 1 && acceptedTypes.contains(it.parameters[0].type) }
     }
 
-    override fun <T : Any> getParseableContentTypes(clazz: KClass<T>): List<ContentType> {
-        return clazz.findAnnotation<BinaryRequest>()?.contentTypes?.map(ContentType.Companion::parse) ?: listOf()
+    override fun <T : Any> getParseableContentTypes(type: KType): List<ContentType> {
+        return type.jvmErasure.findAnnotation<BinaryRequest>()?.contentTypes?.map(ContentType.Companion::parse) ?: listOf()
     }
 
-    override fun <T: Any> getSerializableContentTypes(clazz: KClass<T>):  List<ContentType> {
-        return clazz.findAnnotation<BinaryResponse>()?.contentTypes?.map(ContentType.Companion::parse) ?: listOf()
+    override fun <T: Any> getSerializableContentTypes(type: KType):  List<ContentType> {
+        return type.jvmErasure.findAnnotation<BinaryResponse>()?.contentTypes?.map(ContentType.Companion::parse) ?: listOf()
     }
 
     override suspend fun <T : Any> respond(response: T, request: PipelineContext<Unit, ApplicationCall>, contentType: ContentType) {

src/main/kotlin/com/papsign/ktor/openapigen/content/type/ktor/KtorContentProvider.kt

@@ -22,7 +22,6 @@ import io.ktor.http.HttpStatusCode
 import io.ktor.request.receive
 import io.ktor.response.respond
 import io.ktor.util.pipeline.PipelineContext
-import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.jvm.jvmErasure
@@ -63,15 +62,15 @@ object KtorContentProvider : ContentTypeProvider, BodyParser, ResponseSerializer
         return contentTypes.associateWith { media.copy() }
     }
 
-    override fun <T : Any> getParseableContentTypes(clazz: KClass<T>): List<ContentType> {
+    override fun <T : Any> getParseableContentTypes(type: KType): List<ContentType> {
         return contentTypes!!.toList()
     }
 
     override suspend fun <T: Any> parseBody(clazz: KType, request: PipelineContext<Unit, ApplicationCall>): T {
         return request.call.receive(clazz)
     }
 
-    override fun <T: Any> getSerializableContentTypes(clazz: KClass<T>): List<ContentType> {
+    override fun <T: Any> getSerializableContentTypes(type: KType): List<ContentType> {
         return contentTypes!!.toList()
     }
 

src/main/kotlin/com/papsign/ktor/openapigen/content/type/multipart/MultipartFormDataContentProvider.kt

@@ -31,7 +31,7 @@ import kotlin.reflect.jvm.jvmErasure
 
 object MultipartFormDataContentProvider : BodyParser, OpenAPIGenModuleExtension {
 
-    override fun <T : Any> getParseableContentTypes(clazz: KClass<T>): List<ContentType> {
+    override fun <T : Any> getParseableContentTypes(type: KType): List<ContentType> {
         return listOf(ContentType.MultiPart.FormData)
     }
 
@@ -68,7 +68,7 @@ object MultipartFormDataContentProvider : BodyParser, OpenAPIGenModuleExtension
     private val typeContentTypes = HashMap<KType, Map<String, MediaTypeEncodingModel>>()
 
 
-    override suspend fun <T : Any> parseBody(clazz: KType, request: PipelineContext<Unit, ApplicationCall>): T {
+    override suspend fun <T : Any> parseBody(type: KType, request: PipelineContext<Unit, ApplicationCall>): T {
         val objectMap = HashMap<String, Any>()
         request.context.receiveMultipart().forEachPart {
             val name = it.name
@@ -86,7 +86,8 @@ object MultipartFormDataContentProvider : BodyParser, OpenAPIGenModuleExtension
                 }
             }
         }
-        val ctor = (clazz.classifier as KClass<T>).primaryConstructor!!
+        @Suppress("UNCHECKED_CAST")
+        val ctor = (type.classifier as KClass<T>).primaryConstructor!!
         return ctor.callBy(ctor.parameters.associateWith {
             val raw = objectMap[it.openAPIName]
             if ((raw == null || (raw !is InputStream && streamTypes.contains(it.type))) && it.type.isMarkedNullable) {

src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/RequestHandlerModule.kt

@@ -1,6 +1,5 @@
 package com.papsign.ktor.openapigen.modules.handlers
 
-import com.papsign.ktor.openapigen.getKType
 import com.papsign.ktor.openapigen.OpenAPIGen
 import com.papsign.ktor.openapigen.annotations.Request
 import com.papsign.ktor.openapigen.classLogger
@@ -14,12 +13,11 @@ import com.papsign.ktor.openapigen.modules.ofType
 import com.papsign.ktor.openapigen.modules.openapi.OperationModule
 import com.papsign.ktor.openapigen.modules.providers.ParameterProvider
 import com.papsign.ktor.openapigen.modules.registerModule
-import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.jvm.jvmErasure
 
 class RequestHandlerModule<T : Any>(
-        val requestClass: KClass<T>,
         val requestType: KType,
         val requestExample: T? = null
 ) : OperationModule {
@@ -34,7 +32,7 @@ class RequestHandlerModule<T : Any>(
             mediaType.map { Pair(it.key.toString(), it.value) }
         }.flatten().associate { it }
 
-        val requestMeta = requestClass.findAnnotation<Request>()
+        val requestMeta = requestType.jvmErasure.findAnnotation<Request>()
 
         val parameters = provider.ofType<ParameterProvider>().flatMap { it.getParameters(apiGen, provider) }
         operation.parameters = operation.parameters?.let { (it + parameters).distinct() } ?: parameters
@@ -51,7 +49,6 @@ class RequestHandlerModule<T : Any>(
     }
 
     companion object {
-        inline fun <reified T : Any> create(requestExample: T? = null) = RequestHandlerModule(T::class,
-            getKType<T>(), requestExample)
+        fun <T : Any> create(tType: KType, requestExample: T? = null) = RequestHandlerModule(tType, requestExample)
     }
 }

src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/ResponseHandlerModule.kt

@@ -1,6 +1,5 @@
 package com.papsign.ktor.openapigen.modules.handlers
 
-import com.papsign.ktor.openapigen.getKType
 import com.papsign.ktor.openapigen.OpenAPIGen
 import com.papsign.ktor.openapigen.annotations.Response
 import com.papsign.ktor.openapigen.classLogger
@@ -46,6 +45,6 @@ class ResponseHandlerModule<T>(val responseType: KType, val responseExample: T?
     }
 
     companion object {
-        inline fun <reified T : Any> create(responseExample: T? = null) = ResponseHandlerModule(getKType<T>(), responseExample)
+        fun <T : Any> create(tType: KType, responseExample: T? = null) = ResponseHandlerModule(tType, responseExample)
     }
 }