Skip to content

Commit d9655fd

Browse files
author
Emanuel Moecklin
committed
some refactoring
1 parent 733d265 commit d9655fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+104
-99
lines changed

‎src/main/kotlin/com/papsign/ktor/openapigen/APITag.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.papsign.ktor.openapigen
33
import com.papsign.ktor.openapigen.model.info.ExternalDocumentationModel
44
import com.papsign.ktor.openapigen.model.info.TagModel
55

6-
76
/**
87
* This interface is used to define tags to classify endpoints.
98
* It needs to be implemented using an enum so that the processor properly detects equality.
@@ -12,9 +11,9 @@ import com.papsign.ktor.openapigen.model.info.TagModel
1211
*
1312
* Implementation example:
1413
*
15-
* enum class Tags(override val description: String) : APITag {
16-
* EXAMPLE("Wow this is a tag?!")
17-
* }
14+
* enum class Tags(override val description: String) : APITag {
15+
* EXAMPLE("Wow this is a tag?!")
16+
* }
1817
*
1918
* @see [com.papsign.ktor.openapigen.route.tag]
2019
*/

‎src/main/kotlin/com/papsign/ktor/openapigen/OpenAPIGen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.papsign.ktor.openapigen.model.info.InfoModel
77
import com.papsign.ktor.openapigen.model.server.ServerModel
88
import com.papsign.ktor.openapigen.modules.CachingModuleProvider
99
import com.papsign.ktor.openapigen.modules.OpenAPIModule
10+
import com.papsign.ktor.openapigen.util.classLogger
1011
import io.ktor.application.ApplicationCallPipeline
1112
import io.ktor.application.ApplicationFeature
1213
import io.ktor.application.call
@@ -107,7 +108,7 @@ class OpenAPIGen(
107108
val api = OpenAPIModel()
108109
val cfg = Configuration(api).apply(configure)
109110
if (cfg.serveSwaggerUi) {
110-
val ui = SwaggerUi(cfg.swaggerUiPath, cfg.swaggerUiVersion)
111+
val ui = SwaggerUI(cfg.swaggerUiPath, cfg.swaggerUiVersion)
111112
pipeline.intercept(ApplicationCallPipeline.Call) {
112113
val cmp = "/${cfg.swaggerUiPath.trim('/')}/"
113114
if (call.request.path().startsWith(cmp))

‎src/main/kotlin/com/papsign/ktor/openapigen/SchemaMap.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package com.papsign.ktor.openapigen
44

55
import com.papsign.ktor.openapigen.model.schema.SchemaModel
6+
import com.papsign.ktor.openapigen.util.getKType
67
import kotlin.reflect.KType
78

8-
99
typealias SchemaMap = Map<KType, SchemaModel<*>>
1010

1111
typealias MutableSchemaMap = MutableMap<KType, SchemaModel<*>>

‎src/main/kotlin/com/papsign/ktor/openapigen/SwaggerUI.kt

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,38 @@ import io.ktor.request.port
1414
import io.ktor.response.respond
1515
import java.net.URL
1616

17-
class SwaggerUi(private val basePath: String, private val version: String) {
17+
class SwaggerUI(private val basePath: String, private val version: String) {
1818
private val notFound = mutableListOf<String>()
1919
private val content = mutableMapOf<String, ResourceContent>()
20+
21+
private class ResourceContent(val resource: URL, val address: String) : OutgoingContent.ByteArrayContent() {
22+
private val contentTypes = mapOf(
23+
"html" to Html,
24+
"css" to CSS,
25+
"js" to JavaScript,
26+
"json" to ContentType.Application.Json.withCharset(Charsets.UTF_8),
27+
"png" to PNG
28+
)
29+
30+
private val bytes by lazy {
31+
if (contentType == JavaScript) {
32+
resource.readText().replace("http://localhost:3200/oauth2-redirect.html", address + "oauth2-redirect.html").toByteArray()
33+
} else resource.readBytes()
34+
}
35+
36+
override val contentType: ContentType? by lazy {
37+
val extension = resource.file.substring(resource.file.lastIndexOf('.') + 1)
38+
contentTypes[extension] ?: Html
39+
}
40+
41+
override val contentLength: Long? by lazy {
42+
bytes.size.toLong()
43+
}
44+
45+
override fun bytes(): ByteArray = bytes
46+
override fun toString() = "ResourceContent \"$resource\""
47+
}
48+
2049
suspend fun serve(filename: String?, call: ApplicationCall) {
2150
when (filename) {
2251
in notFound -> return
@@ -38,33 +67,5 @@ class SwaggerUi(private val basePath: String, private val version: String) {
3867
val protocol = request.origin.scheme
3968
return "$protocol://$hostPort/${basePath.trim('/')}/"
4069
}
41-
}
4270

43-
44-
45-
private val contentTypes = mapOf(
46-
"html" to Html,
47-
"css" to CSS,
48-
"js" to JavaScript,
49-
"json" to ContentType.Application.Json.withCharset(Charsets.UTF_8),
50-
"png" to PNG)
51-
52-
private class ResourceContent(val resource: URL, val address: String) : OutgoingContent.ByteArrayContent() {
53-
private val bytes by lazy {
54-
if (contentType == JavaScript) {
55-
resource.readText().replace("http://localhost:3200/oauth2-redirect.html", address + "oauth2-redirect.html").toByteArray()
56-
} else resource.readBytes()
57-
}
58-
59-
override val contentType: ContentType? by lazy {
60-
val extension = resource.file.substring(resource.file.lastIndexOf('.') + 1)
61-
contentTypes[extension] ?: Html
62-
}
63-
64-
override val contentLength: Long? by lazy {
65-
bytes.size.toLong()
66-
}
67-
68-
override fun bytes(): ByteArray = bytes
69-
override fun toString() = "ResourceContent \"$resource\""
70-
}
71+
}

‎src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/NumberConstraintProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.papsign.ktor.openapigen.annotations.type.number
22

33
import com.papsign.ktor.openapigen.annotations.type.common.ConstraintViolation
4-
import com.papsign.ktor.openapigen.classLogger
4+
import com.papsign.ktor.openapigen.util.classLogger
55
import com.papsign.ktor.openapigen.model.schema.SchemaModel
66
import com.papsign.ktor.openapigen.schema.processor.SchemaProcessor
77
import com.papsign.ktor.openapigen.validation.Validator

‎src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/FloatingNumberConstraintProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.annotations.type.number.floating
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import com.papsign.ktor.openapigen.annotations.type.number.NumberConstraintProcessor
55

66
abstract class FloatingNumberConstraintProcessor<A: Annotation>: NumberConstraintProcessor<A>(listOf(

‎src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/integer/IntegerNumberConstraintProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.annotations.type.number.integer
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import com.papsign.ktor.openapigen.annotations.type.number.NumberConstraintProcessor
55

66
abstract class IntegerNumberConstraintProcessor<A: Annotation>: NumberConstraintProcessor<A>(listOf(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.papsign.ktor.openapigen.annotations.type.string.length
22

33
import com.papsign.ktor.openapigen.annotations.type.common.ConstraintViolation
44
import com.papsign.ktor.openapigen.annotations.type.string.NotAStringViolation
5-
import com.papsign.ktor.openapigen.classLogger
6-
import com.papsign.ktor.openapigen.getKType
5+
import com.papsign.ktor.openapigen.util.classLogger
6+
import com.papsign.ktor.openapigen.util.getKType
77
import com.papsign.ktor.openapigen.model.schema.SchemaModel
88
import com.papsign.ktor.openapigen.schema.processor.SchemaProcessor
99
import com.papsign.ktor.openapigen.validation.Validator

‎src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/string/lowercase/LowerCaseValidator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.annotations.type.string.lowercase
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import com.papsign.ktor.openapigen.validation.Validator
55
import com.papsign.ktor.openapigen.annotations.type.SingleTypeValidator
66

‎src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/string/pattern/RegularExpressionConstraintProcessor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.papsign.ktor.openapigen.annotations.type.string.pattern
22

33
import com.papsign.ktor.openapigen.annotations.type.common.ConstraintViolation
44
import com.papsign.ktor.openapigen.annotations.type.string.NotAStringViolation
5-
import com.papsign.ktor.openapigen.classLogger
6-
import com.papsign.ktor.openapigen.getKType
5+
import com.papsign.ktor.openapigen.util.classLogger
6+
import com.papsign.ktor.openapigen.util.getKType
77
import com.papsign.ktor.openapigen.model.schema.SchemaModel
88
import com.papsign.ktor.openapigen.schema.processor.SchemaProcessor
99
import com.papsign.ktor.openapigen.validation.Validator

‎src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/string/trim/TrimValidator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.annotations.type.string.trim
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import com.papsign.ktor.openapigen.validation.Validator
55
import com.papsign.ktor.openapigen.annotations.type.SingleTypeValidator
66

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import com.papsign.ktor.openapigen.model.schema.DataFormat
1111
import com.papsign.ktor.openapigen.model.schema.DataType
1212
import com.papsign.ktor.openapigen.model.schema.SchemaModel
1313
import com.papsign.ktor.openapigen.modules.ModuleProvider
14+
import com.papsign.ktor.openapigen.util.getKType
15+
import com.papsign.ktor.openapigen.util.unitKType
1416
import io.ktor.application.ApplicationCall
1517
import io.ktor.http.ContentType
1618
import io.ktor.http.HttpStatusCode

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.papsign.ktor.openapigen.model.schema.SchemaModel
1212
import com.papsign.ktor.openapigen.modules.ModuleProvider
1313
import com.papsign.ktor.openapigen.modules.ofType
1414
import com.papsign.ktor.openapigen.schema.builder.provider.FinalSchemaBuilderProviderModule
15-
import com.papsign.ktor.openapigen.unitKType
15+
import com.papsign.ktor.openapigen.util.unitKType
1616
import io.ktor.application.*
1717
import io.ktor.features.*
1818
import io.ktor.http.*

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import com.papsign.ktor.openapigen.model.schema.SchemaModel
1111
import com.papsign.ktor.openapigen.modules.ModuleProvider
1212
import com.papsign.ktor.openapigen.modules.ofType
1313
import com.papsign.ktor.openapigen.schema.builder.provider.FinalSchemaBuilderProviderModule
14+
import com.papsign.ktor.openapigen.util.getKType
15+
import com.papsign.ktor.openapigen.util.unitKType
1416
import io.ktor.application.ApplicationCall
1517
import io.ktor.http.ContentType
1618
import io.ktor.http.content.PartData

‎src/main/kotlin/com/papsign/ktor/openapigen/exception/APIException.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.papsign.ktor.openapigen.exception
22

3-
import com.papsign.ktor.openapigen.getKType
4-
import com.papsign.ktor.openapigen.unitKType
3+
import com.papsign.ktor.openapigen.util.getKType
4+
import com.papsign.ktor.openapigen.util.unitKType
55
import io.ktor.http.HttpStatusCode
66
import kotlin.reflect.KClass
77
import kotlin.reflect.KType

‎src/main/kotlin/com/papsign/ktor/openapigen/exception/APIExceptionBuilder.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import io.ktor.http.*
66
* Builder for APIExceptions.
77
* This allows to use a syntax like:
88
*
9-
* apiException<NotFoundException, ErrorMessage> {
10-
* status = HttpStatusCode.NotFound.description("Customer not found")
11-
* example = ErrorMessage("Customer with uuid 26d1229eaba8 not found")
12-
* contentFn = { ErrorMessage(it.message ?: "Customer not found") }
13-
* }
9+
* apiException<NotFoundException, ErrorMessage> {
10+
* status = HttpStatusCode.NotFound.description("Customer not found")
11+
* example = ErrorMessage("Customer with uuid 26d1229eaba8 not found")
12+
* contentFn = { ErrorMessage(it.message ?: "Customer not found") }
13+
* }
1414
*
1515
* You can also use the
1616
*/

‎src/main/kotlin/com/papsign/ktor/openapigen/exception/APIExceptionImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.exception
22

3-
import com.papsign.ktor.openapigen.unitKType
3+
import com.papsign.ktor.openapigen.util.unitKType
44
import io.ktor.http.*
55
import kotlin.reflect.KClass
66
import kotlin.reflect.KType

‎src/main/kotlin/com/papsign/ktor/openapigen/model/DataModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.papsign.ktor.openapigen.model
22

3-
import com.papsign.ktor.openapigen.cleanEmptyValues
4-
import com.papsign.ktor.openapigen.convertToValue
3+
import com.papsign.ktor.openapigen.util.cleanEmptyValues
4+
import com.papsign.ktor.openapigen.util.convertToValue
55
import kotlin.reflect.KProperty1
66
import kotlin.reflect.full.memberProperties
77

‎src/main/kotlin/com/papsign/ktor/openapigen/model/security/SecurityModel.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.papsign.ktor.openapigen.model.security
22

3-
import com.papsign.ktor.openapigen.SerializationSettings
4-
import com.papsign.ktor.openapigen.cleanEmptyValues
5-
import com.papsign.ktor.openapigen.convertToValue
63
import com.papsign.ktor.openapigen.model.DataModel
74
import com.papsign.ktor.openapigen.model.Described
5+
import com.papsign.ktor.openapigen.util.SerializationSettings
6+
import com.papsign.ktor.openapigen.util.cleanEmptyValues
7+
import com.papsign.ktor.openapigen.util.convertToValue
88

99
class SecurityModel : MutableMap<String, List<*>> by mutableMapOf(), DataModel {
10-
1110
operator fun <T> set(scheme: SecuritySchemeModel<T>, requirements: List<T>) where T: Enum<T>, T: Described {
1211
this[scheme.name] = requirements
1312
}

‎src/main/kotlin/com/papsign/ktor/openapigen/model/security/SecuritySchemeModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.papsign.ktor.openapigen.model.security
22

3-
import com.papsign.ktor.openapigen.cleanEmptyValues
4-
import com.papsign.ktor.openapigen.convertToValue
3+
import com.papsign.ktor.openapigen.util.cleanEmptyValues
4+
import com.papsign.ktor.openapigen.util.convertToValue
55
import com.papsign.ktor.openapigen.model.DataModel
66
import com.papsign.ktor.openapigen.model.Described
77
import kotlin.reflect.KProperty1

‎src/main/kotlin/com/papsign/ktor/openapigen/modules/DependentModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.modules
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import kotlin.reflect.KType
55

66
interface DependentModule {

‎src/main/kotlin/com/papsign/ktor/openapigen/modules/ModuleProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.modules
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import kotlin.reflect.KType
55

66
interface ModuleProvider<THIS: ModuleProvider<THIS>> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.papsign.ktor.openapigen.modules.handlers
22

33
import com.papsign.ktor.openapigen.OpenAPIGen
44
import com.papsign.ktor.openapigen.annotations.Request
5-
import com.papsign.ktor.openapigen.classLogger
5+
import com.papsign.ktor.openapigen.util.classLogger
66
import com.papsign.ktor.openapigen.content.type.BodyParser
77
import com.papsign.ktor.openapigen.content.type.ContentTypeProvider
88
import com.papsign.ktor.openapigen.content.type.SelectedParser

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.papsign.ktor.openapigen.modules.handlers
22

33
import com.papsign.ktor.openapigen.OpenAPIGen
44
import com.papsign.ktor.openapigen.annotations.Response
5-
import com.papsign.ktor.openapigen.classLogger
5+
import com.papsign.ktor.openapigen.util.classLogger
66
import com.papsign.ktor.openapigen.content.type.ContentTypeProvider
77
import com.papsign.ktor.openapigen.content.type.ResponseSerializer
88
import com.papsign.ktor.openapigen.content.type.SelectedSerializer

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.papsign.ktor.openapigen.modules.handlers
22

3-
import com.papsign.ktor.openapigen.unitKType
3+
import com.papsign.ktor.openapigen.util.unitKType
44
import com.papsign.ktor.openapigen.OpenAPIGen
5-
import com.papsign.ktor.openapigen.classLogger
5+
import com.papsign.ktor.openapigen.util.classLogger
66
import com.papsign.ktor.openapigen.content.type.ContentTypeProvider
77
import com.papsign.ktor.openapigen.content.type.ResponseSerializer
88
import com.papsign.ktor.openapigen.content.type.SelectedExceptionSerializer

‎src/main/kotlin/com/papsign/ktor/openapigen/modules/providers/MethodProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.modules.providers
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import com.papsign.ktor.openapigen.modules.DependentModule
55
import com.papsign.ktor.openapigen.modules.DependentModule.Companion.handler
66
import com.papsign.ktor.openapigen.modules.OpenAPIModule

‎src/main/kotlin/com/papsign/ktor/openapigen/parameters/handlers/ModularParameterHandler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ import com.papsign.ktor.openapigen.annotations.parameters.PathParam
88
import com.papsign.ktor.openapigen.annotations.parameters.QueryParam
99
import com.papsign.ktor.openapigen.annotations.parameters.apiParam
1010
import com.papsign.ktor.openapigen.exception.OpenAPIRequiredFieldException
11-
import com.papsign.ktor.openapigen.memberProperties
11+
import com.papsign.ktor.openapigen.util.memberProperties
1212
import com.papsign.ktor.openapigen.model.operation.ParameterLocation
1313
import com.papsign.ktor.openapigen.model.operation.ParameterModel
1414
import com.papsign.ktor.openapigen.model.schema.SchemaModel
1515
import com.papsign.ktor.openapigen.modules.ModuleProvider
1616
import com.papsign.ktor.openapigen.modules.ofType
1717
import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
1818
import com.papsign.ktor.openapigen.schema.builder.provider.FinalSchemaBuilderProviderModule
19+
import com.papsign.ktor.openapigen.util.memberProperties
1920
import io.ktor.http.Headers
2021
import io.ktor.http.Parameters
2122
import io.ktor.util.toMap

‎src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/converters/primitive/PrimitiveConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.parameters.parsers.converters.primitive
22

3-
import com.papsign.ktor.openapigen.getKType
3+
import com.papsign.ktor.openapigen.util.getKType
44
import com.papsign.ktor.openapigen.parameters.parsers.converters.Converter
55
import com.papsign.ktor.openapigen.parameters.parsers.converters.ConverterSelector
66
import com.papsign.ktor.openapigen.parameters.util.localDateTimeFormatter

‎src/main/kotlin/com/papsign/ktor/openapigen/route/Functions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.papsign.ktor.openapigen.route
33
import com.papsign.ktor.openapigen.APITag
44
import com.papsign.ktor.openapigen.annotations.Path
55
import com.papsign.ktor.openapigen.content.type.ContentTypeProvider
6-
import com.papsign.ktor.openapigen.getKType
6+
import com.papsign.ktor.openapigen.util.getKType
77
import com.papsign.ktor.openapigen.modules.handlers.RequestHandlerModule
88
import com.papsign.ktor.openapigen.modules.handlers.ResponseHandlerModule
99
import com.papsign.ktor.openapigen.modules.registerModule

‎src/main/kotlin/com/papsign/ktor/openapigen/route/OpenAPIRoute.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.papsign.ktor.openapigen.route
22

3-
import com.papsign.ktor.openapigen.classLogger
3+
import com.papsign.ktor.openapigen.util.classLogger
44
import com.papsign.ktor.openapigen.content.type.*
55
import com.papsign.ktor.openapigen.content.type.ktor.KtorContentProvider
66
import com.papsign.ktor.openapigen.exception.OpenAPINoParserException
@@ -9,7 +9,7 @@ import com.papsign.ktor.openapigen.modules.CachingModuleProvider
99
import com.papsign.ktor.openapigen.modules.OpenAPIModule
1010
import com.papsign.ktor.openapigen.modules.ofType
1111
import com.papsign.ktor.openapigen.modules.openapi.HandlerModule
12-
import com.papsign.ktor.openapigen.openAPIGen
12+
import com.papsign.ktor.openapigen.util.openAPIGen
1313
import com.papsign.ktor.openapigen.parameters.handlers.ParameterHandler
1414
import com.papsign.ktor.openapigen.parameters.util.buildParameterHandler
1515
import com.papsign.ktor.openapigen.route.response.Responder

‎src/main/kotlin/com/papsign/ktor/openapigen/route/response/OpenAPIPipelineResponseContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.papsign.ktor.openapigen.route.response
22

33
import com.papsign.ktor.openapigen.annotations.Response
4-
import com.papsign.ktor.openapigen.getKType
4+
import com.papsign.ktor.openapigen.util.getKType
55
import com.papsign.ktor.openapigen.modules.ofType
66
import com.papsign.ktor.openapigen.modules.providers.AuthProvider
77
import com.papsign.ktor.openapigen.modules.providers.StatusProvider

0 commit comments

Comments
 (0)