some test code cleanup / get rid of some warnings

Author: Emanuel Moecklin

build.gradle

@@ -39,18 +39,12 @@ dependencies {
     testImplementation "ch.qos.logback:logback-classic:$logback_version"
     testImplementation "io.ktor:ktor-auth:$ktor_version"
     testImplementation "io.ktor:ktor-auth-jwt:$ktor_version"
-
-
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.6"
+    kotlinOptions.jvmTarget = "1.8"
     kotlinOptions.freeCompilerArgs += ["-Xuse-experimental=kotlin.ExperimentalStdlibApi"]
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.6"
-}
-
-wrapper {
-    gradleVersion = '6.0.1'
+    kotlinOptions.jvmTarget = "1.8"
 }

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/common/ConstraintViolation.kt

@@ -3,4 +3,4 @@ package com.papsign.ktor.openapigen.annotations.type.common
 import java.lang.Exception
 
 abstract class ConstraintViolation(defaultMessage: String, message: String = "", cause: Throwable? = null)
-    : Exception(if (message.isEmpty()) defaultMessage else message, cause)
+    : Exception(message.ifEmpty { defaultMessage }, cause)

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/string/length/LengthConstraintProcessor.kt

@@ -11,7 +11,7 @@ import com.papsign.ktor.openapigen.validation.ValidatorBuilder
 import kotlin.reflect.KType
 import kotlin.reflect.full.withNullability
 
-abstract class LengthConstraintProcessor<A: Annotation>(): SchemaProcessor<A>, ValidatorBuilder<A> {
+abstract class LengthConstraintProcessor<A: Annotation>: SchemaProcessor<A>, ValidatorBuilder<A> {
 
     private val log = classLogger()
 
@@ -59,14 +59,14 @@ abstract class LengthConstraintProcessor<A: Annotation>(): SchemaProcessor<A>, V
 data class LengthConstraint(val min: Int? = null, val max: Int? = null, val errorMessage: String)
 
 class LengthConstraintViolation(val actual: Number?, val constraint: LengthConstraint): ConstraintViolation("Constraint violation: the length of the string should be ${
-{
-    val min = "${constraint.min}"
-    val max = "${constraint.max}"
-    when {
-        constraint.min != null && constraint.max != null -> "between $min and $max"
-        constraint.min != null -> "at least $min"
-        constraint.max != null -> "at most $max"
-        else -> "anything"
+    run {
+        val min = "${constraint.min}"
+        val max = "${constraint.max}"
+        when {
+            constraint.min != null && constraint.max != null -> "between $min and $max"
+            constraint.min != null -> "at least $min"
+            constraint.max != null -> "at most $max"
+            else -> "anything"
+        }
     }
-}()
 }, but it is $actual", constraint.errorMessage)

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

@@ -17,7 +17,7 @@ import io.ktor.http.content.PartData
 import io.ktor.http.content.forEachPart
 import io.ktor.http.content.streamProvider
 import io.ktor.request.receiveMultipart
-import io.ktor.util.asStream
+import io.ktor.util.*
 import io.ktor.util.pipeline.PipelineContext
 import java.io.InputStream
 import java.time.Instant
@@ -68,6 +68,7 @@ object MultipartFormDataContentProvider : BodyParser, OpenAPIGenModuleExtension
     private val typeContentTypes = HashMap<KType, Map<String, MediaTypeEncodingModel>>()
 
 
+    @OptIn(KtorExperimentalAPI::class)
     override suspend fun <T : Any> parseBody(type: KType, request: PipelineContext<Unit, ApplicationCall>): T {
         val objectMap = HashMap<String, Any>()
         request.context.receiveMultipart().forEachPart {

src/main/kotlin/com/papsign/ktor/openapigen/validation/ValidationHandler.kt

@@ -6,7 +6,6 @@ import kotlin.reflect.*
 import kotlin.reflect.full.*
 import kotlin.reflect.jvm.*
 
-
 /**
  * don't mind the evil leak, it's that or a two-step builder structure to be able to handle recursive types
  */
@@ -315,11 +314,7 @@ class ValidationHandler private constructor(
          */
         fun build(type: AnnotatedKType): ValidationHandler {
             val str = type.toString()
-            return map[str] ?: {
-                ValidationHandler(type) {
-                    map[str] = it
-                }
-            }()
+            return map[str] ?: ValidationHandler(type) { map[str] = it }
         }
 
         fun <T:Any> build(tClass: KClass<T>, annotations: List<Annotation> = listOf()): ValidationHandler {

src/main/kotlin/com/papsign/ktor/openapigen/validation/ValidatorAnnotation.kt

@@ -1,6 +1,5 @@
 package com.papsign.ktor.openapigen.validation
 
-import com.papsign.ktor.openapigen.validation.ValidatorBuilder
 import kotlin.reflect.KClass
 
 @Target(AnnotationTarget.ANNOTATION_CLASS)

src/test/kotlin/Basic.kt

@@ -93,13 +93,13 @@ object Basic {
                         info("String Post Endpoint", "This is a String Post Endpoint"),
                         exampleRequest = setOf(StringUsable("Ho")),
                         exampleResponse = StringUsable("Ho")
-                    ) { params, body ->
+                    ) { _, body ->
                         respond(body.first())
                     }
                 }
 
                 route("generic") {
-                    post<Unit, GenericTest<A?>, GenericTest<A?>> { params, body ->
+                    post<Unit, GenericTest<A?>, GenericTest<A?>> { _, body ->
                         respond(body)
                     }
                 }

src/test/kotlin/Minimal.kt

@@ -92,7 +92,7 @@ object Minimal {
                         info("String Post Endpoint", "This is a String Post Endpoint"),
                         exampleRequest = StringUsable("Ho"),
                         exampleResponse = StringUsable("Ho")
-                    ) { params, body ->
+                    ) { _, body ->
                         respond(body)
                     }
                 }

src/test/kotlin/OneOf.kt

@@ -24,7 +24,7 @@ fun NormalOpenAPIRoute.SealedRoute() {
             info("Sealed class Endpoint", "This is a Sealed class Endpoint"),
             exampleRequest = Base.A("Hi"),
             exampleResponse = Base.A("Hi")
-        ) { params, base ->
+        ) { _, base ->
             respond(base)
         }
     }

src/test/kotlin/TestServer.kt

@@ -106,7 +106,7 @@ object TestServer {
                     "5a21be2"
                 ),
                 exampleResponse = StringResponse("All of the fields were valid")
-            ) { params, body ->
+            ) { _, _ ->
                 respond(StringResponse("All of the fields were valid"))
             }
 
@@ -122,7 +122,7 @@ object TestServer {
                     0.023f
                 ),
                 exampleResponse = StringResponse("All of the fields were valid")
-            ) { params, body ->
+            ) { _, _ ->
                 respond(StringResponse("All of the fields were valid"))
             }
 
@@ -314,8 +314,6 @@ object TestServer {
             }
         }
 
-        val scopes = Scopes.values().asList()
-
         // serve OpenAPI and redirect from root
         routing {
             get("/openapi.json") {
@@ -392,9 +390,6 @@ object TestServer {
         profile("Basic Profile scope"), email("Email scope")
     }
 
-    data class APIPrincipal(val a: String, val b: String)
-
-
     @Request("A LocalDate Request")
     data class LocalDateQuery(@QueryParam("LocalDate") val date: LocalDate)
     data class LocalDateOptionalQuery(@QueryParam("LocalDate") val date: LocalDate?)