Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add Kotlin module to model resolver #48

Merged
merged 1 commit into from
Apr 10, 2023
Merged

feat: Add Kotlin module to model resolver #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kotlin-asyncapi-spring-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions ...in/org/openfolder/kotlinasyncapi/springweb/context/annotation/processor/ConverterUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.openfolder.kotlinasyncapi.springweb.context.annotation.processor

import com.fasterxml.jackson.module.kotlin.registerKotlinModule
import io.swagger.v3.core.converter.ModelConverters
import io.swagger.v3.core.jackson.ModelResolver

internal val MODEL_RESOLVER = ModelConverters().also {
(it.converters.first() as ModelResolver).objectMapper().registerKotlinModule()
}
4 changes: 1 addition & 3 deletions .../org/openfolder/kotlinasyncapi/springweb/context/annotation/processor/MessageProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.openfolder.kotlinasyncapi.springweb.context.annotation.processor

import io.swagger.v3.core.converter.ModelConverters
import org.openfolder.kotlinasyncapi.annotation.channel.Message
import org.openfolder.kotlinasyncapi.model.Reference
import org.openfolder.kotlinasyncapi.model.component.Components
Expand All @@ -10,8 +9,7 @@ import kotlin.reflect.KClass
@Component
internal class MessageProcessor : AnnotationProcessor<Message, KClass<*>> {
override fun process(annotation: Message, context: KClass<*>): Components {
val converters = ModelConverters()
val jsonSchema = converters.readAll(context.java)
val jsonSchema = MODEL_RESOLVER.readAll(context.java)

return Components().apply {
messages {
Expand Down
4 changes: 1 addition & 3 deletions ...n/org/openfolder/kotlinasyncapi/springweb/context/annotation/processor/SchemaProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.openfolder.kotlinasyncapi.springweb.context.annotation.processor

import io.swagger.v3.core.converter.ModelConverters
import org.openfolder.kotlinasyncapi.annotation.Schema
import org.openfolder.kotlinasyncapi.model.component.Components
import org.springframework.stereotype.Component
Expand All @@ -9,8 +8,7 @@ import kotlin.reflect.KClass
@Component
internal class SchemaProcessor : AnnotationProcessor<Schema, KClass<*>> {
override fun process(annotation: Schema, context: KClass<*>): Components {
val converters = ModelConverters()
val jsonSchema = converters.readAll(context.java)
val jsonSchema = MODEL_RESOLVER.readAll(context.java)

return Components().apply {
schemas {
Expand Down
2 changes: 1 addition & 1 deletion ...g/openfolder/kotlinasyncapi/springweb/context/annotation/processor/SchemaProcessorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal class SchemaProcessorTest {
val id: Int = 0,
val name: String,
val isTest: Boolean,
val sub: TestSubSchema
val sub: TestSubSchema?
)

data class TestSubSchema(
Expand Down
4 changes: 3 additions & 1 deletion kotlin-asyncapi-spring-web/src/test/resources/annotation/annotation_integration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
},
"schemas" : {
"TestHeaders" : {
"required" : [ "type" ],
"type" : "object",
"properties" : {
"type" : {
Expand All @@ -69,6 +70,7 @@
"exampleSetFlag" : false
},
"TestMessage" : {
"required" : [ "id", "isTest", "name" ],
"type" : "object",
"properties" : {
"id" : {
Expand All @@ -82,7 +84,7 @@
"exampleSetFlag" : false,
"types" : [ "string" ]
},
"test" : {
"isTest" : {
"type" : "boolean",
"exampleSetFlag" : false,
"types" : [ "boolean" ]
Expand Down
3 changes: 2 additions & 1 deletion kotlin-asyncapi-spring-web/src/test/resources/annotation/message_component.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
},
"schemas" : {
"TestPayload" : {
"required" : [ "id", "isTest", "name" ],
"type" : "object",
"properties" : {
"id" : {
Expand All @@ -31,7 +32,7 @@
"exampleSetFlag" : false,
"types" : [ "string" ]
},
"test" : {
"isTest" : {
"type" : "boolean",
"exampleSetFlag" : false,
"types" : [ "boolean" ]
Expand Down
12 changes: 7 additions & 5 deletions kotlin-asyncapi-spring-web/src/test/resources/annotation/schema_component.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"schemas" : {
"TestSchema" : {
"required" : [ "id", "isTest", "name" ],
"type" : "object",
"properties" : {
"id" : {
Expand All @@ -14,19 +15,20 @@
"exampleSetFlag" : false,
"types" : [ "string" ]
},
"sub" : {
"$ref" : "#/components/schemas/TestSubSchema",
"exampleSetFlag" : false
},
"test" : {
"isTest" : {
"type" : "boolean",
"exampleSetFlag" : false,
"types" : [ "boolean" ]
},
"sub" : {
"$ref" : "#/components/schemas/TestSubSchema",
"exampleSetFlag" : false
}
},
"exampleSetFlag" : false
},
"TestSubSchema" : {
"required" : [ "exists" ],
"type" : "object",
"properties" : {
"exists" : {
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@
<artifactId>jackson-databind</artifactId>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
Expand Down