Skip to content

Commit 801e1dd

Browse files
SMILEY4SMILEY4
committed
upgrade schema-kenerator to 2.0.0-beta.1
1 parent 738e147 commit 801e1dd

File tree

8 files changed

+26
-28
lines changed

8 files changed

+26
-28
lines changed

‎examples/src/main/kotlin/io/github/smiley4/ktoropenapi/examples/CompleteConfig.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import io.github.smiley4.ktorredoc.redoc
1010
import io.github.smiley4.ktorswaggerui.config.SwaggerUISort
1111
import io.github.smiley4.ktorswaggerui.config.SwaggerUISyntaxHighlight
1212
import io.github.smiley4.ktorswaggerui.swaggerUI
13-
import io.github.smiley4.schemakenerator.reflection.processReflection
13+
import io.github.smiley4.schemakenerator.reflection.analyseTypeUsingReflection
1414
import io.github.smiley4.schemakenerator.swagger.compileReferencingRoot
1515
import io.github.smiley4.schemakenerator.swagger.data.TitleType
1616
import io.github.smiley4.schemakenerator.swagger.generateSwaggerSchema
@@ -107,7 +107,7 @@ private fun Application.myModule() {
107107
schema<String>("string")
108108
generator = { type ->
109109
type
110-
.processReflection()
110+
.analyseTypeUsingReflection()
111111
.generateSwaggerSchema()
112112
.withTitle(TitleType.SIMPLE)
113113
.compileReferencingRoot()

‎examples/src/main/kotlin/io/github/smiley4/ktoropenapi/examples/CustomizedSchemaGenerator.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import io.github.smiley4.ktoropenapi.get
55
import io.github.smiley4.ktoropenapi.openApi
66
import io.github.smiley4.ktorredoc.redoc
77
import io.github.smiley4.ktorswaggerui.swaggerUI
8-
import io.github.smiley4.schemakenerator.serialization.processKotlinxSerialization
8+
import io.github.smiley4.schemakenerator.serialization.analyzeTypeUsingKotlinxSerialization
99
import io.github.smiley4.schemakenerator.swagger.compileReferencingRoot
1010
import io.github.smiley4.schemakenerator.swagger.data.TitleType
1111
import io.github.smiley4.schemakenerator.swagger.generateSwaggerSchema
@@ -35,7 +35,7 @@ private fun Application.myModule() {
3535
// process type using kotlinx-serialization instead of reflection
3636
// requires additional dependency "io.github.smiley4:schema-kenerator-kotlinx-serialization:<VERSION>"
3737
// see https://github.com/SMILEY4/schema-kenerator for more information
38-
.processKotlinxSerialization()
38+
.analyzeTypeUsingKotlinxSerialization()
3939
.generateSwaggerSchema()
4040
.withTitle(TitleType.SIMPLE)
4141
.compileReferencingRoot()

‎examples/src/main/kotlin/io/github/smiley4/ktoropenapi/examples/KotlinxSerialization.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.github.smiley4.ktoropenapi.get
66
import io.github.smiley4.ktoropenapi.openApi
77
import io.github.smiley4.ktorredoc.redoc
88
import io.github.smiley4.ktorswaggerui.swaggerUI
9-
import io.github.smiley4.schemakenerator.serialization.processKotlinxSerialization
9+
import io.github.smiley4.schemakenerator.serialization.analyzeTypeUsingKotlinxSerialization
1010
import io.github.smiley4.schemakenerator.swagger.compileReferencingRoot
1111
import io.github.smiley4.schemakenerator.swagger.data.TitleType
1212
import io.github.smiley4.schemakenerator.swagger.generateSwaggerSchema
@@ -33,7 +33,7 @@ private fun Application.myModule() {
3333
// (see https://github.com/SMILEY4/schema-kenerator/wiki for more information)
3434
generator = { type ->
3535
type
36-
.processKotlinxSerialization()
36+
.analyzeTypeUsingKotlinxSerialization()
3737
.generateSwaggerSchema()
3838
.withTitle(TitleType.SIMPLE)
3939
.compileReferencingRoot()

‎examples/src/main/kotlin/io/github/smiley4/ktoropenapi/examples/Schemas.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import io.github.smiley4.ktoropenapi.get
99
import io.github.smiley4.ktoropenapi.openApi
1010
import io.github.smiley4.ktorredoc.redoc
1111
import io.github.smiley4.ktorswaggerui.swaggerUI
12-
import io.github.smiley4.schemakenerator.core.connectSubTypes
12+
import io.github.smiley4.schemakenerator.core.addMissingSupertypeSubtypeRelations
1313
import io.github.smiley4.schemakenerator.jackson.collectJacksonSubTypes
14-
import io.github.smiley4.schemakenerator.reflection.processReflection
14+
import io.github.smiley4.schemakenerator.reflection.analyseTypeUsingReflection
1515
import io.github.smiley4.schemakenerator.swagger.compileReferencingRoot
1616
import io.github.smiley4.schemakenerator.swagger.data.TitleType
1717
import io.github.smiley4.schemakenerator.swagger.generateSwaggerSchema
@@ -54,9 +54,9 @@ private fun Application.myModule() {
5454
// customized schema generation pipeline
5555
generator = { type ->
5656
type
57-
.collectJacksonSubTypes(typeProcessing = { types -> types.processReflection() }) // include types from jackson subtype-annotation
58-
.processReflection()
59-
.connectSubTypes() // connect the supertypes with their subtypes
57+
.collectJacksonSubTypes(typeProcessing = { types -> types.analyseTypeUsingReflection() }) // include types from jackson subtype-annotation
58+
.analyseTypeUsingReflection()
59+
.addMissingSupertypeSubtypeRelations()
6060
.generateSwaggerSchema()
6161
.withTitle(TitleType.SIMPLE)
6262
.compileReferencingRoot()

‎examples/src/main/kotlin/io/github/smiley4/ktoropenapi/examples/TypesafeRouting.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import io.github.smiley4.ktoropenapi.resources.get
77
import io.github.smiley4.ktoropenapi.resources.post
88
import io.github.smiley4.ktorredoc.redoc
99
import io.github.smiley4.ktorswaggerui.swaggerUI
10-
import io.github.smiley4.schemakenerator.serialization.processKotlinxSerialization
10+
import io.github.smiley4.schemakenerator.serialization.analyzeTypeUsingKotlinxSerialization
1111
import io.github.smiley4.schemakenerator.swagger.compileReferencingRoot
1212
import io.github.smiley4.schemakenerator.swagger.data.TitleType
1313
import io.github.smiley4.schemakenerator.swagger.generateSwaggerSchema
@@ -40,7 +40,7 @@ private fun Application.myModule() {
4040
schemas {
4141
generator = { type ->
4242
type
43-
.processKotlinxSerialization()
43+
.analyzeTypeUsingKotlinxSerialization()
4444
.generateSwaggerSchema()
4545
.withTitle(TitleType.SIMPLE)
4646
.handleCoreAnnotations()

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ projectDeveloperUrl=https://github.com/SMILEY4
1616
versionKtor=3.0.0
1717
versionSwaggerUI=5.17.11
1818
versionSwaggerParser=2.1.24
19-
versionSchemaKenerator=1.7.0
19+
versionSchemaKenerator=2.0.0-beta.1
2020
versionKotlinLogging=7.0.0
2121
versionKotest=5.8.0
2222
versionKotlinTest=2.0.21

‎ktor-openapi/src/main/kotlin/io/github/smiley4/ktoropenapi/builder/schema/SchemaContextImpl.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import io.github.smiley4.ktoropenapi.config.TypeDescriptor
1212
import io.github.smiley4.ktoropenapi.data.MultipartBodyData
1313
import io.github.smiley4.ktoropenapi.data.SchemaConfigData
1414
import io.github.smiley4.ktoropenapi.data.SimpleBodyData
15-
import io.github.smiley4.schemakenerator.core.data.AnnotationData
1615
import io.github.smiley4.schemakenerator.core.data.KTypeInput
17-
import io.github.smiley4.schemakenerator.core.data.WildcardTypeData
18-
import io.github.smiley4.schemakenerator.serialization.SerialDescriptorInput
16+
import io.github.smiley4.schemakenerator.core.data.TypeData
17+
import io.github.smiley4.schemakenerator.serialization.data.SerialDescriptorInput
18+
import io.github.smiley4.schemakenerator.swagger.SwaggerSchemaUtils
1919
import io.github.smiley4.schemakenerator.swagger.data.CompiledSwaggerSchema
20-
import io.github.smiley4.schemakenerator.swagger.steps.SwaggerSchemaUtils
2120
import io.swagger.v3.oas.models.media.Schema
2221
import kotlinx.serialization.descriptors.SerialDescriptor
2322
import kotlin.reflect.KType
@@ -69,15 +68,15 @@ internal class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : S
6968
}
7069
is SwaggerTypeDescriptor -> {
7170
CompiledSwaggerSchema(
72-
typeData = WildcardTypeData(),
71+
typeData = TypeData.createWildcard(),
7372
swagger = typeDescriptor.schema,
7473
componentSchemas = emptyMap()
7574
)
7675
}
7776
is ArrayTypeDescriptor -> {
7877
val itemSchema = generateSchema(typeDescriptor.type)
7978
CompiledSwaggerSchema(
80-
typeData = WildcardTypeData(),
79+
typeData = TypeData.createWildcard(),
8180
swagger = SwaggerSchemaUtils().arraySchema(
8281
itemSchema.swagger
8382
),
@@ -87,7 +86,7 @@ internal class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : S
8786
is AnyOfTypeDescriptor -> {
8887
val optionSchemas = typeDescriptor.types.map { generateSchema(it) }
8988
CompiledSwaggerSchema(
90-
typeData = WildcardTypeData(),
89+
typeData = TypeData.createWildcard(),
9190
swagger = SwaggerSchemaUtils().subtypesSchema(
9291
optionSchemas.map { it.swagger },
9392
null,
@@ -102,14 +101,14 @@ internal class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : S
102101
}
103102
is EmptyTypeDescriptor -> {
104103
CompiledSwaggerSchema(
105-
typeData = WildcardTypeData(),
104+
typeData = TypeData.createWildcard(),
106105
swagger = SwaggerSchemaUtils().anyObjectSchema(),
107106
componentSchemas = emptyMap()
108107
)
109108
}
110109
is RefTypeDescriptor -> {
111110
CompiledSwaggerSchema(
112-
typeData = WildcardTypeData(),
111+
typeData = TypeData.createWildcard(),
113112
swagger = SwaggerSchemaUtils().referenceSchema(typeDescriptor.schemaId, true),
114113
componentSchemas = emptyMap()
115114
)

‎ktor-openapi/src/main/kotlin/io/github/smiley4/ktoropenapi/data/SchemaConfigData.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.github.smiley4.ktoropenapi.data
22

33
import io.github.smiley4.ktoropenapi.config.TypeDescriptor
4-
import io.github.smiley4.schemakenerator.core.connectSubTypes
5-
import io.github.smiley4.schemakenerator.core.data.AnnotationData
4+
import io.github.smiley4.schemakenerator.core.addMissingSupertypeSubtypeRelations
65
import io.github.smiley4.schemakenerator.core.data.InputType
76
import io.github.smiley4.schemakenerator.core.handleNameAnnotation
7+
import io.github.smiley4.schemakenerator.reflection.analyseTypeUsingReflection
88
import io.github.smiley4.schemakenerator.reflection.collectSubTypes
9-
import io.github.smiley4.schemakenerator.reflection.processReflection
109
import io.github.smiley4.schemakenerator.swagger.compileReferencingRoot
1110
import io.github.smiley4.schemakenerator.swagger.data.CompiledSwaggerSchema
1211
import io.github.smiley4.schemakenerator.swagger.data.TitleType
@@ -30,8 +29,8 @@ internal data class SchemaConfigData(
3029
generator = { type ->
3130
type
3231
.collectSubTypes()
33-
.processReflection()
34-
.connectSubTypes()
32+
.analyseTypeUsingReflection()
33+
.addMissingSupertypeSubtypeRelations()
3534
.handleNameAnnotation()
3635
.generateSwaggerSchema()
3736
.handleCoreAnnotations()

0 commit comments

Comments
 (0)