removed unused imports

Wicpar · Wicpar · commit 4bdf3b0822e9 · 2019-10-14T17:40:19.000+02:00
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/OpenAPIGen.kt b/src/main/kotlin/com/papsign/ktor/openapigen/OpenAPIGen.kt
@@ -8,13 +8,12 @@ import com.papsign.ktor.openapigen.openapi.ExternalDocumentation
 import com.papsign.ktor.openapigen.openapi.OpenAPI
 import com.papsign.ktor.openapigen.openapi.Schema.SchemaRef
 import com.papsign.ktor.openapigen.openapi.Server
-import io.ktor.application.*
+import io.ktor.application.ApplicationCallPipeline
+import io.ktor.application.ApplicationFeature
+import io.ktor.application.call
 import io.ktor.request.path
 import io.ktor.util.AttributeKey
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.reflections.Reflections
-import javax.xml.bind.JAXBElement
 import kotlin.reflect.KType
 
 class OpenAPIGen(
@@ -125,4 +124,4 @@ class OpenAPIGen(
             return OpenAPIGen(cfg, pipeline)
         }
     }
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/content/type/ResponseSerializer.kt b/src/main/kotlin/com/papsign/ktor/openapigen/content/type/ResponseSerializer.kt
@@ -1,6 +1,5 @@
 package com.papsign.ktor.openapigen.content.type
 
-import io.ktor.application.Application
 import io.ktor.application.ApplicationCall
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
@@ -14,4 +13,4 @@ interface ResponseSerializer: ContentTypeProvider {
     fun <T: Any> getSerializableContentTypes(clazz: KClass<T>): 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)
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/content/type/ktor/KtorContentProvider.kt b/src/main/kotlin/com/papsign/ktor/openapigen/content/type/ktor/KtorContentProvider.kt
@@ -18,7 +18,9 @@ import com.papsign.ktor.openapigen.openapi.DataFormat
 import com.papsign.ktor.openapigen.openapi.DataType
 import com.papsign.ktor.openapigen.openapi.MediaType
 import com.papsign.ktor.openapigen.openapi.Schema
-import io.ktor.application.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.application.featureOrNull
 import io.ktor.features.ContentNegotiation
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
@@ -108,4 +110,4 @@ object KtorContentProvider : ContentTypeProvider, BodyParser, ResponseSerializer
     override suspend fun <T: Any> respond(statusCode: HttpStatusCode, response: T, request: PipelineContext<Unit, ApplicationCall>, contentType: ContentType) {
         request.call.respond(statusCode, response)
     }
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPINoParserException.kt b/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPINoParserException.kt
@@ -1,6 +1,5 @@
 package com.papsign.ktor.openapigen.exceptions
 
 import io.ktor.http.ContentType
-import java.lang.Exception
 
-class OpenAPINoParserException(val contentType: ContentType): Exception("No parser found for content type $contentType")
+class OpenAPINoParserException(val contentType: ContentType): Exception("No parser found for content type $contentType")
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPINoSerializerException.kt b/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPINoSerializerException.kt
@@ -1,7 +1,5 @@
 package com.papsign.ktor.openapigen.exceptions
 
 import io.ktor.http.ContentType
-import io.ktor.http.HeaderValue
-import java.lang.Exception
 
-class OpenAPINoSerializerException(val contentTypes: ContentType): Exception("No serializer found for content types $contentTypes")
+class OpenAPINoSerializerException(val contentTypes: ContentType): Exception("No serializer found for content types $contentTypes")
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPIParseException.kt b/src/main/kotlin/com/papsign/ktor/openapigen/exceptions/OpenAPIParseException.kt
@@ -1,6 +1,5 @@
 package com.papsign.ktor.openapigen.exceptions
 
-import java.lang.Exception
 import kotlin.reflect.KClass
 
-class OpenAPIParseException(val request: KClass<*>, val actual: Set<KClass<*>>): Exception("Could not parse $request as $actual")
+class OpenAPIParseException(val request: KClass<*>, val actual: Set<KClass<*>>): Exception("Could not parse $request as $actual")
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/interop/StatusPages.kt b/src/main/kotlin/com/papsign/ktor/openapigen/interop/StatusPages.kt
@@ -1,7 +1,7 @@
 package com.papsign.ktor.openapigen.interop
 
-import com.papsign.ktor.openapigen.OpenAPIGen
 import com.papsign.ktor.openapigen.APIException.Companion.apiException
+import com.papsign.ktor.openapigen.OpenAPIGen
 import com.papsign.ktor.openapigen.route.ThrowsInfo
 import io.ktor.application.call
 import io.ktor.features.StatusPages
@@ -35,4 +35,4 @@ class OpenAPIGenStatusPagesInterop(val api: OpenAPIGen, val statusCfg: StatusPag
             }
         }
     }
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/RequestHandlerModule.kt b/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/RequestHandlerModule.kt
@@ -12,7 +12,6 @@ import com.papsign.ktor.openapigen.modules.ModuleProvider
 import com.papsign.ktor.openapigen.modules.ofClass
 import com.papsign.ktor.openapigen.modules.openapi.OperationModule
 import com.papsign.ktor.openapigen.modules.providers.ParameterProvider
-import com.papsign.ktor.openapigen.openapi.MediaType
 import com.papsign.ktor.openapigen.openapi.Operation
 import com.papsign.ktor.openapigen.openapi.RequestBody
 import kotlin.reflect.KClass
@@ -55,4 +54,4 @@ class RequestHandlerModule<T : Any>(
         inline fun <reified T : Any> create(requestExample: T? = null) =
                 RequestHandlerModule(T::class, getKType<T>(), requestExample)
     }
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/RouteHandler.kt b/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/RouteHandler.kt
@@ -1,17 +1,12 @@
 package com.papsign.ktor.openapigen.modules.handlers
 
 import com.papsign.ktor.openapigen.OpenAPIGen
-import com.papsign.ktor.openapigen.content.type.ContentTypeProvider
 import com.papsign.ktor.openapigen.content.type.SelectedModule
-import com.papsign.ktor.openapigen.content.type.SelectedParser
-import com.papsign.ktor.openapigen.content.type.SelectedSerializer
-import com.papsign.ktor.openapigen.generator.ParamBuilder
 import com.papsign.ktor.openapigen.modules.ModuleProvider
 import com.papsign.ktor.openapigen.modules.ofClass
 import com.papsign.ktor.openapigen.modules.openapi.HandlerModule
 import com.papsign.ktor.openapigen.modules.openapi.OperationModule
 import com.papsign.ktor.openapigen.modules.providers.MethodProvider
-import com.papsign.ktor.openapigen.modules.providers.ParameterProvider
 import com.papsign.ktor.openapigen.modules.providers.PathProvider
 import com.papsign.ktor.openapigen.openapi.Operation
 import com.papsign.ktor.openapigen.openapi.PathItem
@@ -40,4 +35,4 @@ object RouteHandler: HandlerModule {
         }
         log.trace("Registered $path::${methods.map { it.method.value }} with OpenAPI description with ${provider.ofClass<SelectedModule>().map { it.module::class.simpleName }}")
     }
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/TagHandlerModule.kt b/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/TagHandlerModule.kt
@@ -1,10 +1,10 @@
 package com.papsign.ktor.openapigen.modules.handlers
 
-import com.papsign.ktor.openapigen.modules.providers.TagProviderModule
 import com.papsign.ktor.openapigen.OpenAPIGen
 import com.papsign.ktor.openapigen.modules.ModuleProvider
 import com.papsign.ktor.openapigen.modules.ofClass
 import com.papsign.ktor.openapigen.modules.openapi.OperationModule
+import com.papsign.ktor.openapigen.modules.providers.TagProviderModule
 import com.papsign.ktor.openapigen.openapi.Operation
 
 object TagHandlerModule: OperationModule {
@@ -18,4 +18,4 @@ object TagHandlerModule: OperationModule {
         }
     }
 
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/ThrowOperationHandler.kt b/src/main/kotlin/com/papsign/ktor/openapigen/modules/handlers/ThrowOperationHandler.kt
@@ -6,7 +6,6 @@ import com.papsign.ktor.openapigen.classLogger
 import com.papsign.ktor.openapigen.content.type.ContentTypeProvider
 import com.papsign.ktor.openapigen.content.type.ResponseSerializer
 import com.papsign.ktor.openapigen.content.type.SelectedExceptionSerializer
-import com.papsign.ktor.openapigen.content.type.SelectedSerializer
 import com.papsign.ktor.openapigen.modules.ModuleProvider
 import com.papsign.ktor.openapigen.modules.ofClass
 import com.papsign.ktor.openapigen.modules.openapi.OperationModule
@@ -47,4 +46,4 @@ object ThrowOperationHandler : OperationModule {
             } ?: StatusResponse(statusCode.description, content = map.toMutableMap())
         }
     }
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/modules/providers/TagProviderModule.kt b/src/main/kotlin/com/papsign/ktor/openapigen/modules/providers/TagProviderModule.kt
@@ -1,13 +1,13 @@
 package com.papsign.ktor.openapigen.modules.providers
 
-import com.papsign.ktor.openapigen.modules.handlers.TagHandlerModule
 import com.papsign.ktor.openapigen.APITag
 import com.papsign.ktor.openapigen.modules.DependentModule
 import com.papsign.ktor.openapigen.modules.OpenAPIModule
 import com.papsign.ktor.openapigen.modules.RouteOpenAPIModule
+import com.papsign.ktor.openapigen.modules.handlers.TagHandlerModule
 
 interface TagProviderModule: RouteOpenAPIModule, DependentModule {
     val tags: Collection<APITag>
     override val handlers: Collection<OpenAPIModule>
         get() = listOf(TagHandlerModule)
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/modules/providers/ThrowInfoProvider.kt b/src/main/kotlin/com/papsign/ktor/openapigen/modules/providers/ThrowInfoProvider.kt
@@ -1,12 +1,12 @@
 package com.papsign.ktor.openapigen.modules.providers
 
 import com.papsign.ktor.openapigen.APIException
-import com.papsign.ktor.openapigen.modules.OpenAPIModule
 import com.papsign.ktor.openapigen.modules.DependentModule
+import com.papsign.ktor.openapigen.modules.OpenAPIModule
 import com.papsign.ktor.openapigen.modules.handlers.ThrowOperationHandler
 
 interface ThrowInfoProvider: OpenAPIModule, DependentModule {
     val exceptions: List<APIException<*, *>>
     override val handlers: Collection<OpenAPIModule>
         get() = listOf(ThrowOperationHandler)
-}
+}
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/route/RouteConfig.kt b/src/main/kotlin/com/papsign/ktor/openapigen/route/RouteConfig.kt
@@ -2,7 +2,8 @@ package com.papsign.ktor.openapigen.route
 
 import com.papsign.ktor.openapigen.OpenAPIGen
 import com.papsign.ktor.openapigen.route.path.normal.NormalOpenAPIRoute
-import io.ktor.application.*
+import io.ktor.application.Application
+import io.ktor.application.feature
 import io.ktor.routing.routing
 import io.ktor.util.pipeline.ContextDsl
 
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/route/TagModule.kt b/src/main/kotlin/com/papsign/ktor/openapigen/route/TagModule.kt
@@ -1,8 +1,8 @@
 package com.papsign.ktor.openapigen.route
 
-import com.papsign.ktor.openapigen.modules.providers.TagProviderModule
 import com.papsign.ktor.openapigen.APITag
+import com.papsign.ktor.openapigen.modules.providers.TagProviderModule
 
 class TagModule(override val tags: Collection<APITag>): TagProviderModule
 
-fun tags(vararg tags: APITag) = TagModule(tags.asList())
+fun tags(vararg tags: APITag) = TagModule(tags.asList())
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/route/path/auth/Functions.kt b/src/main/kotlin/com/papsign/ktor/openapigen/route/path/auth/Functions.kt
@@ -3,8 +3,8 @@ package com.papsign.ktor.openapigen.route.path.auth
 import com.papsign.ktor.openapigen.interop.OAuth2Handler
 import com.papsign.ktor.openapigen.modules.RouteOpenAPIModule
 import com.papsign.ktor.openapigen.openapi.Described
-import com.papsign.ktor.openapigen.route.path.normal.NormalOpenAPIRoute
 import com.papsign.ktor.openapigen.route.method
+import com.papsign.ktor.openapigen.route.path.normal.NormalOpenAPIRoute
 import com.papsign.ktor.openapigen.route.preHandle
 import com.papsign.ktor.openapigen.route.response.OpenAPIPipelineAuthContext
 import io.ktor.http.HttpMethod
diff --git a/src/main/kotlin/com/papsign/ktor/openapigen/route/path/normal/Functions.kt b/src/main/kotlin/com/papsign/ktor/openapigen/route/path/normal/Functions.kt
@@ -1,9 +1,9 @@
 package com.papsign.ktor.openapigen.route.path.normal
 
 import com.papsign.ktor.openapigen.modules.RouteOpenAPIModule
+import com.papsign.ktor.openapigen.route.method
 import com.papsign.ktor.openapigen.route.preHandle
 import com.papsign.ktor.openapigen.route.response.OpenAPIPipelineResponseContext
-import com.papsign.ktor.openapigen.route.method
 import io.ktor.http.HttpMethod
 import io.ktor.util.pipeline.ContextDsl
 
@@ -93,4 +93,4 @@ inline fun <reified P : Any, reified R : Any> NormalOpenAPIRoute.handle(
     preHandle<P, R, Unit, NormalOpenAPIRoute>(exampleResponse, Unit) {
         handle(body)
     }
-}
+}
diff --git a/src/test/kotlin/TestServer.kt b/src/test/kotlin/TestServer.kt
@@ -19,7 +19,10 @@ import com.papsign.ktor.openapigen.openapi.Described
 import com.papsign.ktor.openapigen.openapi.Server
 import com.papsign.ktor.openapigen.route.apiRouting
 import com.papsign.ktor.openapigen.route.info
-import com.papsign.ktor.openapigen.route.path.auth.*
+import com.papsign.ktor.openapigen.route.path.auth.auth
+import com.papsign.ktor.openapigen.route.path.auth.get
+import com.papsign.ktor.openapigen.route.path.auth.post
+import com.papsign.ktor.openapigen.route.path.auth.principal
 import com.papsign.ktor.openapigen.route.path.normal.get
 import com.papsign.ktor.openapigen.route.response.respond
 import com.papsign.ktor.openapigen.route.route
@@ -245,4 +248,4 @@ object TestServer {
     }
 
     data class APIPrincipal(val a: String, val b: String)
-}
+}
diff --git a/src/test/kotlin/com/papsign/ktor/openapigen/content/type/multipart/MultipartFormDataContentProviderTest.kt b/src/test/kotlin/com/papsign/ktor/openapigen/content/type/multipart/MultipartFormDataContentProviderTest.kt
@@ -8,11 +8,10 @@ import installJackson
 import installOpenAPI
 import io.ktor.http.*
 import io.ktor.http.content.PartData
-import io.ktor.routing.Routing
 import io.ktor.server.testing.handleRequest
 import io.ktor.server.testing.setBody
 import io.ktor.server.testing.withTestApplication
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.declaredMemberProperties
@@ -75,4 +74,4 @@ class MultipartFormDataContentProviderTest {
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.papsign.ktor.openapigen.interop`
`2`	`2`
`3`		`-import com.papsign.ktor.openapigen.OpenAPIGen`
`4`	`3`	`import com.papsign.ktor.openapigen.APIException.Companion.apiException`
	`4`	`+import com.papsign.ktor.openapigen.OpenAPIGen`
`5`	`5`	`import com.papsign.ktor.openapigen.route.ThrowsInfo`
`6`	`6`	`import io.ktor.application.call`
`7`	`7`	`import io.ktor.features.StatusPages`
`@@ -35,4 +35,4 @@ class OpenAPIGenStatusPagesInterop(val api: OpenAPIGen, val statusCfg: StatusPag`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-}`
	`38`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`package com.papsign.ktor.openapigen.modules.handlers`
`2`	`2`
`3`		`-import com.papsign.ktor.openapigen.modules.providers.TagProviderModule`
`4`	`3`	`import com.papsign.ktor.openapigen.OpenAPIGen`
`5`	`4`	`import com.papsign.ktor.openapigen.modules.ModuleProvider`
`6`	`5`	`import com.papsign.ktor.openapigen.modules.ofClass`
`7`	`6`	`import com.papsign.ktor.openapigen.modules.openapi.OperationModule`
	`7`	`+import com.papsign.ktor.openapigen.modules.providers.TagProviderModule`
`8`	`8`	`import com.papsign.ktor.openapigen.openapi.Operation`
`9`	`9`
`10`	`10`	`object TagHandlerModule: OperationModule {`
`@@ -18,4 +18,4 @@ object TagHandlerModule: OperationModule {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`-}`
	`21`	`+}`