From cf25fe0b538f49ebb6e1e888e6d4954af882858b Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Thu, 5 Dec 2024 11:03:29 -0500 Subject: [PATCH 01/15] allow annotation to target function also. --- .../openfolder/kotlinasyncapi/annotation/channel/Channel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt index cf5a810..5b6ce54 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt @@ -4,7 +4,8 @@ import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation @Target( AnnotationTarget.CLASS, - AnnotationTarget.ANNOTATION_CLASS + AnnotationTarget.ANNOTATION_CLASS, + AnnotationTarget.FUNCTION ) @AsyncApiAnnotation annotation class Channel( From 7bb9a5b199b71568a683b371de4d5368890f083b Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Tue, 10 Dec 2024 13:18:53 -0500 Subject: [PATCH 02/15] add support for channel on functions instead of just classes. --- .../annotation/channel/Channel.kt | 3 +- .../context/annotation/AnnotationProvider.kt | 29 ++++++++++---- .../annotation/processor/ChannelProcessor.kt | 34 +++++++++++----- .../processor/ChannelProcessorTest.kt | 40 ++++++++++++++++++- .../channel_component_function.json | 22 ++++++++++ kotlin-asyncapi-spring-web/pom.xml | 2 +- .../springweb/AsyncApiAutoConfiguration.kt | 4 +- 7 files changed, 112 insertions(+), 22 deletions(-) create mode 100644 kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt index cf5a810..5b6ce54 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt @@ -4,7 +4,8 @@ import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation @Target( AnnotationTarget.CLASS, - AnnotationTarget.ANNOTATION_CLASS + AnnotationTarget.ANNOTATION_CLASS, + AnnotationTarget.FUNCTION ) @AsyncApiAnnotation annotation class Channel( diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt index c6f1c2f..42d4511 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -24,6 +24,7 @@ import org.openfolder.kotlinasyncapi.model.server.ReferencableServerVariablesMap import org.openfolder.kotlinasyncapi.model.server.ReferencableServersMap import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation +import kotlin.reflect.full.functions class AnnotationProvider( private val applicationPackage: Package? = null, @@ -31,7 +32,7 @@ class AnnotationProvider( private val scanner: AnnotationScanner, private val messageProcessor: AnnotationProcessor>, private val schemaProcessor: AnnotationProcessor>, - private val channelProcessor: AnnotationProcessor> + private val channelProcessor: AnnotationProcessor ) : AsyncApiContextProvider { private val componentToChannelMapping = mutableMapOf() @@ -67,19 +68,31 @@ class AnnotationProvider( annotatedClasses .flatMap { clazz -> - listOfNotNull( + val classAnnotations = listOfNotNull( clazz.findAnnotation()?.let { clazz to it }, clazz.findAnnotation()?.let { clazz to it }, clazz.findAnnotation()?.let { clazz to it } ) + + val functionAnnotations = clazz.functions.flatMap { function -> + listOfNotNull( + function.findAnnotation()?.let { function to it }, + function.findAnnotation()?.let { function to it }, + function.findAnnotation()?.let { function to it } + ) + } + + classAnnotations + functionAnnotations } - .mapNotNull { (clazz, annotation) -> + .mapNotNull { (element, annotation) -> when (annotation) { - is Message -> messageProcessor.process(annotation, clazz) - is Schema -> schemaProcessor.process(annotation, clazz) - is Channel -> channelProcessor.process(annotation, clazz).also { - componentToChannelMapping[clazz.java.simpleName] = - annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName + is Message -> if (element is KClass<*>) messageProcessor.process(annotation, element) else null + is Schema -> if (element is KClass<*>) schemaProcessor.process(annotation, element) else null + is Channel -> channelProcessor.process(annotation, element).also { + if (element is KClass<*>) { + componentToChannelMapping[element.java.simpleName] = + annotation.value.takeIf { it.isNotEmpty() } ?: element.java.simpleName + } } else -> null } diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt index 5ba68e5..2eaa1b9 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt @@ -5,22 +5,38 @@ import org.openfolder.kotlinasyncapi.annotation.channel.Publish import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe import org.openfolder.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass +import kotlin.reflect.KFunction import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.functions import kotlin.reflect.full.hasAnnotation -class ChannelProcessor : AnnotationProcessor> { - override fun process(annotation: Channel, context: KClass<*>): Components { +class ChannelProcessor : AnnotationProcessor { + override fun process(annotation: Channel, context: Any): Components { return Components().apply { channels { - annotation.toChannel() - .apply { - subscribe = subscribe ?: context.findSubscribeOperation()?.toOperation() - publish = publish ?: context.findPublishOperation()?.toOperation() + when (context) { + is KClass<*> -> { + annotation.toChannel() + .apply { + subscribe = subscribe ?: context.findSubscribeOperation()?.toOperation() + publish = publish ?: context.findPublishOperation()?.toOperation() + } + .also { + put(context.java.simpleName, it) + } } - .also { - put(context.java.simpleName, it) + is KFunction<*> -> { + annotation.toChannel() + .apply { + subscribe = subscribe ?: context.findAnnotation()?.toOperation() + publish = publish ?: context.findAnnotation()?.toOperation() + } + .also { + put(context.name, it) + } } + else -> throw IllegalArgumentException("Unsupported context type: ${context::class}") + } } } } @@ -30,4 +46,4 @@ class ChannelProcessor : AnnotationProcessor> { private fun KClass<*>.findPublishOperation(): Publish? = functions.firstOrNull { it.hasAnnotation() }?.findAnnotation() -} +} \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt index 34bc22b..b5ed641 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt @@ -11,13 +11,14 @@ import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals import org.openfolder.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation +import kotlin.reflect.full.functions internal class ChannelProcessorTest { private val processor = ChannelProcessor() @Test - fun `should process channel annotation`() { + fun `should process channel annotation on class`() { val payload = TestChannel::class val annotation = payload.findAnnotation()!! @@ -65,6 +66,43 @@ internal class ChannelProcessorTest { fun testPublish() {} } + @Test + fun `should process channel annotation on function`() { + val payload = TestChannelFunction::class + val annotation = payload.functions.flatMap { it.annotations }.filterIsInstance().firstOrNull()!! + + val expected = json("annotation/channel_component_function.json") + val actual = json(processor.process(annotation, payload)) + + assertJsonEquals(expected, actual) + } + + + class TestChannelFunction { + @Channel( + value = "some/{parameter}/channel", + description = "testDescription", + servers = ["dev"], + parameters = [ + Parameter( + value = "parameter", + description = "testDescription" + ) + ] + ) + @Subscribe( + operationId = "testOperationId", + security = [ + SecurityRequirement( + key = "petstore_auth", + values = ["write:pets", "read:pets"] + ) + ], + message = Message(TestSubscribeMessage::class) + ) + fun testSubscribe() {} + } + @Message data class TestSubscribeMessage( val id: Int = 0, diff --git a/kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json b/kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json new file mode 100644 index 0000000..1170bf8 --- /dev/null +++ b/kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json @@ -0,0 +1,22 @@ +{ + "channels" : { + "TestChannelFunction" : { + "description" : "testDescription", + "servers" : [ "dev" ], + "subscribe" : { + "operationId" : "testOperationId", + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ], + "message" : { + "$ref" : "#/components/messages/TestSubscribeMessage" + } + }, + "parameters" : { + "parameter" : { + "description" : "testDescription" + } + } + } + } +} diff --git a/kotlin-asyncapi-spring-web/pom.xml b/kotlin-asyncapi-spring-web/pom.xml index 0926cc3..dc0bb83 100644 --- a/kotlin-asyncapi-spring-web/pom.xml +++ b/kotlin-asyncapi-spring-web/pom.xml @@ -32,7 +32,7 @@ org.springframework.boot spring-boot-autoconfigure - [2.6.4,2.7.17], [3.2.0,) + [2.6.4,2.7.17], [3.2.0,3.3.5] org.jetbrains.kotlin diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index eaf07a0..bd8ffd4 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -13,9 +13,9 @@ import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider import org.openfolder.kotlinasyncapi.context.annotation.AnnotationScanner import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner import org.openfolder.kotlinasyncapi.context.annotation.processor.AnnotationProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor +import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension import org.openfolder.kotlinasyncapi.context.service.AsyncApiSerializer import org.openfolder.kotlinasyncapi.context.service.AsyncApiService @@ -112,7 +112,7 @@ internal open class AsyncApiAnnotationAutoConfiguration { scanner: AnnotationScanner, messageProcessor: AnnotationProcessor>, schemaProcessor: AnnotationProcessor>, - channelProcessor: AnnotationProcessor> + channelProcessor: AnnotationProcessor ) = packageFromContext(context)?.let { AnnotationProvider( applicationPackage = it, From e6c5479962adc24ceb27937a7ff0cf22d048fc13 Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Tue, 10 Dec 2024 15:11:24 -0500 Subject: [PATCH 03/15] split into a separate processor with new annotation to handle finding the correct classes. --- .../annotation/AsyncApiDocumentation.kt | 4 ++ .../context/annotation/AnnotationProvider.kt | 32 ++++------ .../AsyncApiDocumentationProcessor.kt | 31 ++++++++++ .../annotation/processor/ChannelProcessor.kt | 32 +++------- .../AsyncApiDocumentationProcessorTest.kt | 62 +++++++++++++++++++ .../processor/ChannelProcessorTest.kt | 40 +----------- ...=> async_api_documentation_component.json} | 2 +- .../kotlinasyncapi/ktor/AsyncApiModule.kt | 4 ++ .../springweb/AsyncApiAutoConfiguration.kt | 12 +++- 9 files changed, 132 insertions(+), 87 deletions(-) create mode 100644 kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt create mode 100644 kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt create mode 100644 kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt rename kotlin-asyncapi-context/src/test/resources/annotation/{channel_component_function.json => async_api_documentation_component.json} (94%) diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt new file mode 100644 index 0000000..db3066a --- /dev/null +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt @@ -0,0 +1,4 @@ +package org.openfolder.kotlinasyncapi.annotation + +@Target(AnnotationTarget.CLASS) +annotation class AsyncApiDocumentation \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt index 42d4511..677b41e 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -1,6 +1,7 @@ package org.openfolder.kotlinasyncapi.context.annotation import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation +import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation import org.openfolder.kotlinasyncapi.annotation.Schema import org.openfolder.kotlinasyncapi.annotation.channel.Channel import org.openfolder.kotlinasyncapi.annotation.channel.Message @@ -24,7 +25,6 @@ import org.openfolder.kotlinasyncapi.model.server.ReferencableServerVariablesMap import org.openfolder.kotlinasyncapi.model.server.ReferencableServersMap import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation -import kotlin.reflect.full.functions class AnnotationProvider( private val applicationPackage: Package? = null, @@ -32,7 +32,8 @@ class AnnotationProvider( private val scanner: AnnotationScanner, private val messageProcessor: AnnotationProcessor>, private val schemaProcessor: AnnotationProcessor>, - private val channelProcessor: AnnotationProcessor + private val channelProcessor: AnnotationProcessor>, + private val asyncApiDocumentationProcessor: AnnotationProcessor> ) : AsyncApiContextProvider { private val componentToChannelMapping = mutableMapOf() @@ -68,32 +69,21 @@ class AnnotationProvider( annotatedClasses .flatMap { clazz -> - val classAnnotations = listOfNotNull( + listOfNotNull( clazz.findAnnotation()?.let { clazz to it }, clazz.findAnnotation()?.let { clazz to it }, clazz.findAnnotation()?.let { clazz to it } ) - - val functionAnnotations = clazz.functions.flatMap { function -> - listOfNotNull( - function.findAnnotation()?.let { function to it }, - function.findAnnotation()?.let { function to it }, - function.findAnnotation()?.let { function to it } - ) - } - - classAnnotations + functionAnnotations } - .mapNotNull { (element, annotation) -> + .mapNotNull { (clazz, annotation) -> when (annotation) { - is Message -> if (element is KClass<*>) messageProcessor.process(annotation, element) else null - is Schema -> if (element is KClass<*>) schemaProcessor.process(annotation, element) else null - is Channel -> channelProcessor.process(annotation, element).also { - if (element is KClass<*>) { - componentToChannelMapping[element.java.simpleName] = - annotation.value.takeIf { it.isNotEmpty() } ?: element.java.simpleName - } + is Message -> messageProcessor.process(annotation, clazz) + is Schema -> schemaProcessor.process(annotation, clazz) + is Channel -> channelProcessor.process(annotation, clazz).also { + componentToChannelMapping[clazz.java.simpleName] = + annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName } + is AsyncApiDocumentation -> asyncApiDocumentationProcessor.process(annotation, clazz) else -> null } } diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt new file mode 100644 index 0000000..5402714 --- /dev/null +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt @@ -0,0 +1,31 @@ +package org.openfolder.kotlinasyncapi.context.annotation.processor + +import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation +import org.openfolder.kotlinasyncapi.annotation.channel.Channel +import org.openfolder.kotlinasyncapi.annotation.channel.Publish +import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe +import org.openfolder.kotlinasyncapi.model.component.Components +import kotlin.reflect.KClass +import kotlin.reflect.KFunction +import kotlin.reflect.full.findAnnotation +import kotlin.reflect.full.functions +import kotlin.reflect.full.hasAnnotation + +class AsyncApiDocumentationProcessor : AnnotationProcessor> { + override fun process(annotation: AsyncApiDocumentation, context: KClass<*>): Components { + return Components().apply { + channels { + context.functions.filter { it.hasAnnotation() }.forEach { currentFunction -> + currentFunction.findAnnotation()!!.toChannel() + .apply { + subscribe = subscribe ?: currentFunction.findAnnotation()?.toOperation() + publish = publish ?: currentFunction.findAnnotation()?.toOperation() + } + .also { + put(currentFunction.name, it) + } + } + } + } + } +} \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt index 2eaa1b9..85db9fa 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt @@ -5,38 +5,22 @@ import org.openfolder.kotlinasyncapi.annotation.channel.Publish import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe import org.openfolder.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass -import kotlin.reflect.KFunction import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.functions import kotlin.reflect.full.hasAnnotation -class ChannelProcessor : AnnotationProcessor { - override fun process(annotation: Channel, context: Any): Components { +class ChannelProcessor : AnnotationProcessor> { + override fun process(annotation: Channel, context: KClass<*>): Components { return Components().apply { channels { - when (context) { - is KClass<*> -> { - annotation.toChannel() - .apply { - subscribe = subscribe ?: context.findSubscribeOperation()?.toOperation() - publish = publish ?: context.findPublishOperation()?.toOperation() - } - .also { - put(context.java.simpleName, it) - } + annotation.toChannel() + .apply { + subscribe = subscribe ?: context.findSubscribeOperation()?.toOperation() + publish = publish ?: context.findPublishOperation()?.toOperation() } - is KFunction<*> -> { - annotation.toChannel() - .apply { - subscribe = subscribe ?: context.findAnnotation()?.toOperation() - publish = publish ?: context.findAnnotation()?.toOperation() - } - .also { - put(context.name, it) - } + .also { + put(context.java.simpleName, it) } - else -> throw IllegalArgumentException("Unsupported context type: ${context::class}") - } } } } diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt new file mode 100644 index 0000000..28f1e0b --- /dev/null +++ b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt @@ -0,0 +1,62 @@ +package org.openfolder.kotlinasyncapi.context.annotation.processor + +import org.junit.jupiter.api.Test +import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation +import org.openfolder.kotlinasyncapi.annotation.channel.Channel +import org.openfolder.kotlinasyncapi.annotation.channel.Message +import org.openfolder.kotlinasyncapi.annotation.channel.Parameter +import org.openfolder.kotlinasyncapi.annotation.channel.SecurityRequirement +import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe +import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals +import org.openfolder.kotlinasyncapi.context.TestUtils.json +import kotlin.reflect.full.findAnnotation + +internal class AsyncApiDocumentationProcessorTest { + + private val processor = AsyncApiDocumentationProcessor() + + @Test + fun `should process async api documentation annotation on class`() { + val payload = TestChannelFunction::class + val annotation = payload.findAnnotation()!! + + val expected = json("annotation/async_api_documentation_component.json") + val actual = json(processor.process(annotation, payload)) + + assertJsonEquals(expected, actual) + } + + + @AsyncApiDocumentation + class TestChannelFunction { + @Channel( + value = "some/{parameter}/channel", + description = "testDescription", + servers = ["dev"], + parameters = [ + Parameter( + value = "parameter", + description = "testDescription" + ) + ] + ) + @Subscribe( + operationId = "testOperationId", + security = [ + SecurityRequirement( + key = "petstore_auth", + values = ["write:pets", "read:pets"] + ) + ], + message = Message(TestSubscribeMessage::class) + ) + fun testSubscribe() {} + } + + @Message + data class TestSubscribeMessage( + val id: Int = 0, + val name: String, + val isTest: Boolean + ) +} \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt index b5ed641..34bc22b 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt @@ -11,14 +11,13 @@ import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals import org.openfolder.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation -import kotlin.reflect.full.functions internal class ChannelProcessorTest { private val processor = ChannelProcessor() @Test - fun `should process channel annotation on class`() { + fun `should process channel annotation`() { val payload = TestChannel::class val annotation = payload.findAnnotation()!! @@ -66,43 +65,6 @@ internal class ChannelProcessorTest { fun testPublish() {} } - @Test - fun `should process channel annotation on function`() { - val payload = TestChannelFunction::class - val annotation = payload.functions.flatMap { it.annotations }.filterIsInstance().firstOrNull()!! - - val expected = json("annotation/channel_component_function.json") - val actual = json(processor.process(annotation, payload)) - - assertJsonEquals(expected, actual) - } - - - class TestChannelFunction { - @Channel( - value = "some/{parameter}/channel", - description = "testDescription", - servers = ["dev"], - parameters = [ - Parameter( - value = "parameter", - description = "testDescription" - ) - ] - ) - @Subscribe( - operationId = "testOperationId", - security = [ - SecurityRequirement( - key = "petstore_auth", - values = ["write:pets", "read:pets"] - ) - ], - message = Message(TestSubscribeMessage::class) - ) - fun testSubscribe() {} - } - @Message data class TestSubscribeMessage( val id: Int = 0, diff --git a/kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json b/kotlin-asyncapi-context/src/test/resources/annotation/async_api_documentation_component.json similarity index 94% rename from kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json rename to kotlin-asyncapi-context/src/test/resources/annotation/async_api_documentation_component.json index 1170bf8..c1e86bc 100644 --- a/kotlin-asyncapi-context/src/test/resources/annotation/channel_component_function.json +++ b/kotlin-asyncapi-context/src/test/resources/annotation/async_api_documentation_component.json @@ -1,6 +1,6 @@ { "channels" : { - "TestChannelFunction" : { + "testSubscribe" : { "description" : "testDescription", "servers" : [ "dev" ], "subscribe" : { diff --git a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt b/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt index 854728d..14ea0fe 100644 --- a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt +++ b/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt @@ -14,6 +14,7 @@ import org.openfolder.kotlinasyncapi.context.PackageInfoProvider import org.openfolder.kotlinasyncapi.context.ResourceProvider import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner +import org.openfolder.kotlinasyncapi.context.annotation.processor.AsyncApiDocumentationProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor @@ -52,6 +53,8 @@ class AsyncApiModule( private val channelProcessor = ChannelProcessor() + private val asyncApiDocumentationProcessor = AsyncApiDocumentationProcessor() + private val annotationScanner = DefaultAnnotationScanner() private val annotationProvider = with(configuration) { @@ -62,6 +65,7 @@ class AsyncApiModule( messageProcessor = messageProcessor, schemaProcessor = schemaProcessor, channelProcessor = channelProcessor, + asyncApiDocumentationProcessor = asyncApiDocumentationProcessor ) } diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index bd8ffd4..32c565f 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -1,5 +1,6 @@ package org.openfolder.kotlinasyncapi.springweb +import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation import kotlin.reflect.KClass import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost @@ -13,6 +14,7 @@ import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider import org.openfolder.kotlinasyncapi.context.annotation.AnnotationScanner import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner import org.openfolder.kotlinasyncapi.context.annotation.processor.AnnotationProcessor +import org.openfolder.kotlinasyncapi.context.annotation.processor.AsyncApiDocumentationProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor @@ -102,6 +104,10 @@ internal open class AsyncApiAnnotationAutoConfiguration { open fun channelProcessor() = ChannelProcessor() + @Bean + open fun asyncApiDocumentationProcessor() = + AsyncApiDocumentationProcessor() + @Bean open fun annotationScanner() = DefaultAnnotationScanner() @@ -112,14 +118,16 @@ internal open class AsyncApiAnnotationAutoConfiguration { scanner: AnnotationScanner, messageProcessor: AnnotationProcessor>, schemaProcessor: AnnotationProcessor>, - channelProcessor: AnnotationProcessor + channelClassProcessor: AnnotationProcessor>, + asyncApiDocumentationProcessor: AnnotationProcessor> ) = packageFromContext(context)?.let { AnnotationProvider( applicationPackage = it, scanner = scanner, messageProcessor = messageProcessor, schemaProcessor = schemaProcessor, - channelProcessor = channelProcessor, + channelProcessor = channelClassProcessor, + asyncApiDocumentationProcessor = asyncApiDocumentationProcessor, ) } From f85697d3027c122ee4ab264280fd753f9cf49ff8 Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Tue, 10 Dec 2024 15:22:04 -0500 Subject: [PATCH 04/15] match previous white space --- .../context/annotation/processor/ChannelProcessor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt index 85db9fa..5ba68e5 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt @@ -30,4 +30,4 @@ class ChannelProcessor : AnnotationProcessor> { private fun KClass<*>.findPublishOperation(): Publish? = functions.firstOrNull { it.hasAnnotation() }?.findAnnotation() -} \ No newline at end of file +} From 1a2a12f6730b325d87cc602ab1f841fd6867cca3 Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Wed, 11 Dec 2024 13:35:42 -0500 Subject: [PATCH 05/15] name updates per PR comments. --- .../kotlinasyncapi/annotation/AsyncApiAnnotation.kt | 1 + .../{AsyncApiDocumentation.kt => AsyncApiComponent.kt} | 2 +- .../context/annotation/AnnotationProvider.kt | 6 +++--- ...ationProcessor.kt => AsyncApiComponentProcessor.kt} | 7 +++---- ...cessorTest.kt => AsyncApiComponentProcessorTest.kt} | 10 +++++----- .../openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt | 6 +++--- .../springweb/AsyncApiAutoConfiguration.kt | 10 +++++----- 7 files changed, 21 insertions(+), 21 deletions(-) rename kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/{AsyncApiDocumentation.kt => AsyncApiComponent.kt} (68%) rename kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/{AsyncApiDocumentationProcessor.kt => AsyncApiComponentProcessor.kt} (79%) rename kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/{AsyncApiDocumentationProcessorTest.kt => AsyncApiComponentProcessorTest.kt} (86%) diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt index 17b6c6c..7fe265f 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt @@ -1,4 +1,5 @@ package org.openfolder.kotlinasyncapi.annotation @Target(AnnotationTarget.ANNOTATION_CLASS) +@AsyncApiAnnotation annotation class AsyncApiAnnotation diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt similarity index 68% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt index db3066a..4594cc0 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiDocumentation.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt @@ -1,4 +1,4 @@ package org.openfolder.kotlinasyncapi.annotation @Target(AnnotationTarget.CLASS) -annotation class AsyncApiDocumentation \ No newline at end of file +annotation class AsyncApiComponent \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt index 677b41e..af4f12b 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -1,7 +1,7 @@ package org.openfolder.kotlinasyncapi.context.annotation import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation -import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation +import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent import org.openfolder.kotlinasyncapi.annotation.Schema import org.openfolder.kotlinasyncapi.annotation.channel.Channel import org.openfolder.kotlinasyncapi.annotation.channel.Message @@ -33,7 +33,7 @@ class AnnotationProvider( private val messageProcessor: AnnotationProcessor>, private val schemaProcessor: AnnotationProcessor>, private val channelProcessor: AnnotationProcessor>, - private val asyncApiDocumentationProcessor: AnnotationProcessor> + private val asyncApiComponentProcessor: AnnotationProcessor> ) : AsyncApiContextProvider { private val componentToChannelMapping = mutableMapOf() @@ -83,7 +83,7 @@ class AnnotationProvider( componentToChannelMapping[clazz.java.simpleName] = annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName } - is AsyncApiDocumentation -> asyncApiDocumentationProcessor.process(annotation, clazz) + is AsyncApiComponent -> asyncApiComponentProcessor.process(annotation, clazz) else -> null } } diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt similarity index 79% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt rename to kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt index 5402714..79f7b50 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt @@ -1,18 +1,17 @@ package org.openfolder.kotlinasyncapi.context.annotation.processor -import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation +import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent import org.openfolder.kotlinasyncapi.annotation.channel.Channel import org.openfolder.kotlinasyncapi.annotation.channel.Publish import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe import org.openfolder.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass -import kotlin.reflect.KFunction import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.functions import kotlin.reflect.full.hasAnnotation -class AsyncApiDocumentationProcessor : AnnotationProcessor> { - override fun process(annotation: AsyncApiDocumentation, context: KClass<*>): Components { +class AsyncApiComponentProcessor : AnnotationProcessor> { + override fun process(annotation: AsyncApiComponent, context: KClass<*>): Components { return Components().apply { channels { context.functions.filter { it.hasAnnotation() }.forEach { currentFunction -> diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt similarity index 86% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt index 28f1e0b..86fd929 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiDocumentationProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt @@ -1,7 +1,7 @@ package org.openfolder.kotlinasyncapi.context.annotation.processor import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation +import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent import org.openfolder.kotlinasyncapi.annotation.channel.Channel import org.openfolder.kotlinasyncapi.annotation.channel.Message import org.openfolder.kotlinasyncapi.annotation.channel.Parameter @@ -11,14 +11,14 @@ import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals import org.openfolder.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation -internal class AsyncApiDocumentationProcessorTest { +internal class AsyncApiComponentProcessorTest { - private val processor = AsyncApiDocumentationProcessor() + private val processor = AsyncApiComponentProcessor() @Test fun `should process async api documentation annotation on class`() { val payload = TestChannelFunction::class - val annotation = payload.findAnnotation()!! + val annotation = payload.findAnnotation()!! val expected = json("annotation/async_api_documentation_component.json") val actual = json(processor.process(annotation, payload)) @@ -27,7 +27,7 @@ internal class AsyncApiDocumentationProcessorTest { } - @AsyncApiDocumentation + @AsyncApiComponent class TestChannelFunction { @Channel( value = "some/{parameter}/channel", diff --git a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt b/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt index 14ea0fe..19fc245 100644 --- a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt +++ b/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt @@ -14,7 +14,7 @@ import org.openfolder.kotlinasyncapi.context.PackageInfoProvider import org.openfolder.kotlinasyncapi.context.ResourceProvider import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner -import org.openfolder.kotlinasyncapi.context.annotation.processor.AsyncApiDocumentationProcessor +import org.openfolder.kotlinasyncapi.context.annotation.processor.AsyncApiComponentProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor @@ -53,7 +53,7 @@ class AsyncApiModule( private val channelProcessor = ChannelProcessor() - private val asyncApiDocumentationProcessor = AsyncApiDocumentationProcessor() + private val asyncApiComponentProcessor = AsyncApiComponentProcessor() private val annotationScanner = DefaultAnnotationScanner() @@ -65,7 +65,7 @@ class AsyncApiModule( messageProcessor = messageProcessor, schemaProcessor = schemaProcessor, channelProcessor = channelProcessor, - asyncApiDocumentationProcessor = asyncApiDocumentationProcessor + asyncApiComponentProcessor = asyncApiComponentProcessor ) } diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index 32c565f..16170b8 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -1,6 +1,6 @@ package org.openfolder.kotlinasyncapi.springweb -import org.openfolder.kotlinasyncapi.annotation.AsyncApiDocumentation +import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent import kotlin.reflect.KClass import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost @@ -14,7 +14,7 @@ import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider import org.openfolder.kotlinasyncapi.context.annotation.AnnotationScanner import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner import org.openfolder.kotlinasyncapi.context.annotation.processor.AnnotationProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.AsyncApiDocumentationProcessor +import org.openfolder.kotlinasyncapi.context.annotation.processor.AsyncApiComponentProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor @@ -106,7 +106,7 @@ internal open class AsyncApiAnnotationAutoConfiguration { @Bean open fun asyncApiDocumentationProcessor() = - AsyncApiDocumentationProcessor() + AsyncApiComponentProcessor() @Bean open fun annotationScanner() = @@ -119,7 +119,7 @@ internal open class AsyncApiAnnotationAutoConfiguration { messageProcessor: AnnotationProcessor>, schemaProcessor: AnnotationProcessor>, channelClassProcessor: AnnotationProcessor>, - asyncApiDocumentationProcessor: AnnotationProcessor> + asyncApiComponentProcessor: AnnotationProcessor> ) = packageFromContext(context)?.let { AnnotationProvider( applicationPackage = it, @@ -127,7 +127,7 @@ internal open class AsyncApiAnnotationAutoConfiguration { messageProcessor = messageProcessor, schemaProcessor = schemaProcessor, channelProcessor = channelClassProcessor, - asyncApiDocumentationProcessor = asyncApiDocumentationProcessor, + asyncApiComponentProcessor = asyncApiComponentProcessor, ) } From 2d97e67b8174f6f83eb4f58ba3b2bfc83bb977ad Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Wed, 11 Dec 2024 13:39:02 -0500 Subject: [PATCH 06/15] fix annotation location --- .../openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt | 1 - .../openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt index 7fe265f..17b6c6c 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt @@ -1,5 +1,4 @@ package org.openfolder.kotlinasyncapi.annotation @Target(AnnotationTarget.ANNOTATION_CLASS) -@AsyncApiAnnotation annotation class AsyncApiAnnotation diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt index 4594cc0..a04b8a6 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt @@ -1,4 +1,5 @@ package org.openfolder.kotlinasyncapi.annotation @Target(AnnotationTarget.CLASS) +@AsyncApiAnnotation annotation class AsyncApiComponent \ No newline at end of file From 6e158c44a96921b7a81415cedc6a17337a5f1e6f Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Wed, 11 Dec 2024 16:29:19 -0500 Subject: [PATCH 07/15] add AsyncApiComponent population of channel map behavior to match Channel behavior. added value attribute to AsyncApiComponent for parity. --- .../kotlinasyncapi/annotation/AsyncApiComponent.kt | 4 +++- .../kotlinasyncapi/context/annotation/AnnotationProvider.kt | 5 ++++- .../annotation/processor/AsyncApiComponentProcessorTest.kt | 4 ++-- ...documentation_component.json => async_api_component.json} | 0 4 files changed, 9 insertions(+), 4 deletions(-) rename kotlin-asyncapi-context/src/test/resources/annotation/{async_api_documentation_component.json => async_api_component.json} (100%) diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt index a04b8a6..6f7e17f 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt @@ -2,4 +2,6 @@ package org.openfolder.kotlinasyncapi.annotation @Target(AnnotationTarget.CLASS) @AsyncApiAnnotation -annotation class AsyncApiComponent \ No newline at end of file +annotation class AsyncApiComponent( + val value: String = "", +) \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt index af4f12b..2b6dcc2 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -83,7 +83,10 @@ class AnnotationProvider( componentToChannelMapping[clazz.java.simpleName] = annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName } - is AsyncApiComponent -> asyncApiComponentProcessor.process(annotation, clazz) + is AsyncApiComponent -> asyncApiComponentProcessor.process(annotation, clazz).also { + componentToChannelMapping[clazz.java.simpleName] = + annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName + } else -> null } } diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt index 86fd929..97e793d 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt @@ -16,11 +16,11 @@ internal class AsyncApiComponentProcessorTest { private val processor = AsyncApiComponentProcessor() @Test - fun `should process async api documentation annotation on class`() { + fun `should process async api component annotation on class`() { val payload = TestChannelFunction::class val annotation = payload.findAnnotation()!! - val expected = json("annotation/async_api_documentation_component.json") + val expected = json("annotation/async_api_component.json") val actual = json(processor.process(annotation, payload)) assertJsonEquals(expected, actual) diff --git a/kotlin-asyncapi-context/src/test/resources/annotation/async_api_documentation_component.json b/kotlin-asyncapi-context/src/test/resources/annotation/async_api_component.json similarity index 100% rename from kotlin-asyncapi-context/src/test/resources/annotation/async_api_documentation_component.json rename to kotlin-asyncapi-context/src/test/resources/annotation/async_api_component.json From eaf536dd2216611b72b910c4157ed65f99633e20 Mon Sep 17 00:00:00 2001 From: Lorenz Simon Date: Sun, 15 Dec 2024 10:23:14 +0100 Subject: [PATCH 08/15] chore: move domain (#77) * feat: Implement message model annotations (#43) * feat - Implement message model annotations * chore - Remove unused dependencies * feat: Process message and schema annotations (#44) * feat - Implement Message annotation processing * feat - Merge annotation components * feat - Add schema annotation processor * refactor - Make annotation processor context dynamic test - Add annotation provider integration test * chore - ktlint format * refactor - Refactor dependency management --------- Co-authored-by: lorenzsimon * feat: Channel annotation processing (#45) * feat - Add Channel and Operation annotations * feat - Add Channel processing * refactor - Annotation keys to values * chore - Fix confusing test values * refactor: Annotation mapping (#47) * refactor - Annotation mapping improvements * refactor - Add option for inline messages and schemas * refactor - Use classname for channel component keys if autogenerated * fix - Typo * test - Fix Schemas test * feat: Add Kotlin module to model resolver (#48) feat - Add Kotlin module to model resolver * feat: Bind channels to annotation components (#49) * refactor - Context providers * feat - Bind channels to annotation components * refactor - Annotation components binding * chore - Format * chore: Add Spring Boot example application (#63) * chore: Add Spring Boot example application * fix: Java version * fix: Test * chore: Bump dependencies (#65) * chore: Bump dependencies * chore: Bump dependencies * chore: Set Java version in GH actions * fix: Autoconfig migration * fix: Migrate Jakarta * chore: Refactor data objects (#67) * chore: Revert * release: 3.0.3 * pre-release: 3.0.4 * feat: Add Ktor integration (#72) * docs: Update Spring support * pre-release: 3.0.4 (#70) * docs: Link Spring Boot example * Add Ktor integration * Fix content type * Fix test * Fix test * Add Script extension * Add Script extension * Refactor * Add plugin integration test * Add docs for ktor integration * Move to new domain namespace * Fix kts example usage * Move domain * Bump dependencies --------- Co-authored-by: Lorenz Simon <95355196+lorenz-scalable@users.noreply.github.com> --- README.md | 12 +- kotlin-asyncapi-annotation/pom.xml | 2 +- .../annotation/AsyncApiAnnotation.kt | 2 +- .../annotation/CorrelationID.kt | 2 +- .../annotation/ExternalDocumentation.kt | 2 +- .../kotlinasyncapi/annotation/Primitive.kt | 2 +- .../kotlinasyncapi/annotation/Schema.kt | 2 +- .../kotlinasyncapi/annotation/Tag.kt | 2 +- .../annotation/channel/Channel.kt | 4 +- .../annotation/channel/ChannelBinding.kt | 8 +- .../annotation/channel/Message.kt | 12 +- .../annotation/channel/MessageBinding.kt | 6 +- .../annotation/channel/MessageExample.kt | 2 +- .../annotation/channel/MessageTrait.kt | 10 +- .../annotation/channel/Operation.kt | 8 +- .../annotation/channel/OperationBinding.kt | 8 +- .../annotation/channel/OperationTrait.kt | 6 +- .../annotation/channel/Parameter.kt | 4 +- .../annotation/channel/SecurityRequirement.kt | 2 +- kotlin-asyncapi-context/pom.xml | 8 +- .../context/AsyncApiContextProvider.kt | 8 + .../context/PackageInfoProvider.kt | 4 +- .../context/ResourceProvider.kt | 4 +- .../context/annotation/AnnotationProvider.kt | 46 ++-- .../context/annotation/AnnotationScanner.kt | 2 +- .../processor/AnnotationProcessor.kt | 7 + .../annotation/processor/ChannelProcessor.kt | 10 +- .../annotation/processor/ConverterUtils.kt | 2 +- .../annotation/processor/MappingUtils.kt | 214 +++++++++--------- .../annotation/processor/MessageProcessor.kt | 8 +- .../annotation/processor/SchemaProcessor.kt | 6 +- .../context/service/AsyncApiExtension.kt | 6 +- .../context/service/AsyncApiSerializer.kt | 4 +- .../context/service/AsyncApiService.kt | 4 +- .../context/AsyncApiContextProvider.kt | 8 - .../processor/AnnotationProcessor.kt | 7 - .../kotlinasyncapi/context}/TestUtils.kt | 2 +- .../processor/ChannelProcessorTest.kt | 20 +- .../processor/MessageProcessorTest.kt | 12 +- .../processor/SchemaProcessorTest.kt | 8 +- .../context/service/AsyncApiExtensionTest.kt | 4 +- .../service/DefaultAsyncApiSerializerTest.kt | 6 +- .../service/DefaultAsyncApiServiceTest.kt | 4 +- kotlin-asyncapi-core/pom.xml | 2 +- .../kotlinasyncapi/model/AsyncApi.kt | 10 +- .../kotlinasyncapi/model/CorrelationID.kt | 2 +- .../model/ExternalDocumentation.kt | 2 +- .../kotlinasyncapi/model/Reference.kt | 2 +- .../asyncapi}/kotlinasyncapi/model/Schema.kt | 2 +- .../asyncapi}/kotlinasyncapi/model/Tag.kt | 2 +- .../kotlinasyncapi/model/channel/Channel.kt | 6 +- .../model/channel/ChannelBinding.kt | 8 +- .../kotlinasyncapi/model/channel/Message.kt | 16 +- .../model/channel/MessageBinding.kt | 8 +- .../model/channel/MessageExample.kt | 4 +- .../model/channel/MessageTrait.kt | 16 +- .../kotlinasyncapi/model/channel/Operation.kt | 12 +- .../model/channel/OperationBinding.kt | 8 +- .../model/channel/OperationTrait.kt | 10 +- .../kotlinasyncapi/model/channel/Parameter.kt | 8 +- .../model/component/Components.kt | 32 +-- .../model/component/OAuthFlows.kt | 4 +- .../model/component/SecuritySchema.kt | 6 +- .../kotlinasyncapi/model/info/Contact.kt | 4 +- .../kotlinasyncapi/model/info/Info.kt | 4 +- .../kotlinasyncapi/model/info/License.kt | 4 +- .../kotlinasyncapi/model/server/Server.kt | 6 +- .../model/server/ServerBinding.kt | 6 +- .../model/server/ServerVariable.kt | 6 +- .../model/AsyncApiIntegrationTest.kt | 8 +- .../kotlinasyncapi/model/AsyncApiTest.kt | 4 +- .../kotlinasyncapi/model/CorrelationIDTest.kt | 6 +- .../model/ExternalDocumentationTest.kt | 6 +- .../kotlinasyncapi/model/ReferenceTest.kt | 6 +- .../kotlinasyncapi/model/SchemaTest.kt | 6 +- .../asyncapi}/kotlinasyncapi/model/TagTest.kt | 6 +- .../kotlinasyncapi/model}/TestUtils.kt | 2 +- .../model/channel/ChannelBindingTest.kt | 6 +- .../model/channel/ChannelTest.kt | 6 +- .../model/channel/MessageBindingTest.kt | 6 +- .../model/channel/MessageExampleTest.kt | 6 +- .../model/channel/MessageTest.kt | 10 +- .../model/channel/MessageTraitTest.kt | 10 +- .../model/channel/OperationBindingTest.kt | 6 +- .../model/channel/OperationTest.kt | 8 +- .../model/channel/OperationTraitTest.kt | 8 +- .../model/channel/ParameterTest.kt | 6 +- .../model/component/ComponentsTest.kt | 6 +- .../model/component/OAuthFlowsTest.kt | 6 +- .../model/component/SecuritySchemaTest.kt | 6 +- .../kotlinasyncapi/model/info/ContactTest.kt | 6 +- .../kotlinasyncapi/model/info/InfoTest.kt | 6 +- .../kotlinasyncapi/model/info/LicenseTest.kt | 6 +- .../model/server/ServerBindingTest.kt | 6 +- .../kotlinasyncapi/model/server/ServerTest.kt | 6 +- .../model/server/ServerVariableTest.kt | 6 +- .../main/resources => }/build.asyncapi.kts | 0 .../kotlin-asyncapi-ktor-example/pom.xml | 8 +- .../example/ktor/AsyncApiConfiguration.kt | 4 +- .../example/ktor/ChatMessage.kt | 9 + .../example/ktor/ExampleApplication.kt | 4 +- .../example/ktor/RoomChannel.kt | 12 +- .../example/ktor/ChatMessage.kt | 9 - .../main/resources => }/build.asyncapi.kts | 0 .../pom.xml | 8 +- .../example/spring/AsyncApiConfiguration.kt | 4 +- .../example/spring/ChatMessage.kt | 9 + .../example/spring/ExampleApplication.kt | 4 +- .../example/spring/RoomChannel.kt | 12 +- .../example/spring/ChatMessage.kt | 9 - .../example/spring/ExampleApplicationTests.kt | 2 +- kotlin-asyncapi-examples/pom.xml | 2 +- kotlin-asyncapi-ktor/pom.xml | 4 +- .../ktor/AsyncApiConfiguration.kt | 4 +- .../kotlinasyncapi/ktor/AsyncApiModule.kt | 26 +-- .../kotlinasyncapi/ktor/AsyncApiPlugin.kt | 2 +- .../ktor/AsyncApiPluginIntegrationTest.kt | 32 +-- .../kotlinasyncapi/ktor}/TestUtils.kt | 2 +- kotlin-asyncapi-maven-plugin/pom.xml | 6 +- .../mavenplugin/AsyncApiFileWriter.kt | 4 +- .../mavenplugin/AsyncApiPlugin.kt | 4 +- .../mavenplugin/AsyncApiScriptRunner.kt | 6 +- .../mavenplugin/AsyncApiJsonWriterTest.kt | 8 +- .../mavenplugin/AsyncApiPluginTest.kt | 4 +- .../mavenplugin/AsyncApiScriptHostTest.kt | 6 +- .../kotlinasyncapi/mavenplugin}/TestUtils.kt | 2 +- .../kotlinasyncapi/mavenplugin/TestUtils.kt | 20 -- kotlin-asyncapi-script/pom.xml | 4 +- .../kotlinasyncapi/script/AsyncApiScript.kt | 6 +- kotlin-asyncapi-spring-web/pom.xml | 8 +- .../springweb/AsyncApiAutoConfiguration.kt | 38 ++-- .../springweb/AsyncApiController.kt | 6 +- .../springweb/AsyncApiProperties.kt | 2 +- .../springweb/EnableAsyncApi.kt | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../kotlinasyncapi/springweb/TestUtils.kt | 20 ++ .../AnnotationProviderIntegrationTest.kt | 36 +-- .../AsyncApiControllerIntegrationTest.kt | 14 +- .../ResourceProviderIntegrationTest.kt | 8 +- pom.xml | 42 ++-- 140 files changed, 637 insertions(+), 637 deletions(-) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/AsyncApiAnnotation.kt (62%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/CorrelationID.kt (73%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/ExternalDocumentation.kt (74%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/Primitive.kt (80%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/Schema.kt (97%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/Tag.kt (81%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/Channel.kt (79%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/ChannelBinding.kt (95%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/Message.kt (71%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/MessageBinding.kt (95%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/MessageExample.kt (76%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/MessageTrait.kt (69%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/Operation.kt (84%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/OperationBinding.kt (95%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/OperationTrait.kt (67%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/Parameter.kt (65%) rename kotlin-asyncapi-annotation/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/annotation/channel/SecurityRequirement.kt (70%) create mode 100644 kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/AsyncApiContextProvider.kt rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/PackageInfoProvider.kt (80%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/ResourceProvider.kt (83%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/AnnotationProvider.kt (72%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/AnnotationScanner.kt (94%) create mode 100644 kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt (76%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt (82%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/MappingUtils.kt (70%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt (77%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt (66%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/service/AsyncApiExtension.kt (95%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/service/AsyncApiSerializer.kt (84%) rename kotlin-asyncapi-context/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/service/AsyncApiService.kt (79%) delete mode 100644 kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/AsyncApiContextProvider.kt delete mode 100644 kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt rename {kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model => kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context}/TestUtils.kt (94%) rename kotlin-asyncapi-context/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt (74%) rename kotlin-asyncapi-context/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt (70%) rename kotlin-asyncapi-context/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt (74%) rename kotlin-asyncapi-context/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt (96%) rename kotlin-asyncapi-context/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt (85%) rename kotlin-asyncapi-context/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt (94%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/AsyncApi.kt (84%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/CorrelationID.kt (93%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/ExternalDocumentation.kt (86%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/Reference.kt (76%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/Schema.kt (99%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/Tag.kt (93%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/Channel.kt (91%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/ChannelBinding.kt (97%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/Message.kt (90%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageBinding.kt (96%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageExample.kt (86%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageTrait.kt (87%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/Operation.kt (84%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/OperationBinding.kt (97%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/OperationTrait.kt (86%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/Parameter.kt (80%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/component/Components.kt (75%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/component/OAuthFlows.kt (91%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/component/SecuritySchema.kt (89%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/info/Contact.kt (75%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/info/Info.kt (87%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/info/License.kt (68%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/server/Server.kt (92%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/server/ServerBinding.kt (97%) rename kotlin-asyncapi-core/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/server/ServerVariable.kt (84%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/AsyncApiIntegrationTest.kt (94%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/AsyncApiTest.kt (92%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/CorrelationIDTest.kt (71%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/ExternalDocumentationTest.kt (71%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/ReferenceTest.kt (66%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/SchemaTest.kt (92%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/TagTest.kt (81%) rename {kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor => kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model}/TestUtils.kt (94%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/ChannelBindingTest.kt (83%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/ChannelTest.kt (74%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageBindingTest.kt (71%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageExampleTest.kt (74%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageTest.kt (81%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/MessageTraitTest.kt (80%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/OperationBindingTest.kt (73%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/OperationTest.kt (80%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/OperationTraitTest.kt (79%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/channel/ParameterTest.kt (70%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/component/ComponentsTest.kt (80%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/component/OAuthFlowsTest.kt (87%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/component/SecuritySchemaTest.kt (78%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/info/ContactTest.kt (69%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/info/InfoTest.kt (82%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/info/LicenseTest.kt (67%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/server/ServerBindingTest.kt (80%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/server/ServerTest.kt (77%) rename kotlin-asyncapi-core/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/model/server/ServerVariableTest.kt (73%) rename kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/{src/main/resources => }/build.asyncapi.kts (100%) rename kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt (69%) create mode 100644 kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ChatMessage.kt rename kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/ktor/ExampleApplication.kt (72%) rename kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/ktor/RoomChannel.kt (66%) delete mode 100644 kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ChatMessage.kt rename kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/{src/main/resources => }/build.asyncapi.kts (100%) rename kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt (79%) create mode 100644 kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ChatMessage.kt rename kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/spring/ExampleApplication.kt (69%) rename kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/spring/RoomChannel.kt (67%) delete mode 100644 kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ChatMessage.kt rename kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/example/spring/ExampleApplicationTests.kt (77%) rename kotlin-asyncapi-ktor/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/ktor/AsyncApiConfiguration.kt (78%) rename kotlin-asyncapi-ktor/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/ktor/AsyncApiModule.kt (78%) rename kotlin-asyncapi-ktor/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/ktor/AsyncApiPlugin.kt (88%) rename kotlin-asyncapi-ktor/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt (84%) rename {kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context => kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor}/TestUtils.kt (94%) rename kotlin-asyncapi-maven-plugin/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt (85%) rename kotlin-asyncapi-maven-plugin/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt (95%) rename kotlin-asyncapi-maven-plugin/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt (83%) rename kotlin-asyncapi-maven-plugin/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt (76%) rename kotlin-asyncapi-maven-plugin/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt (94%) rename kotlin-asyncapi-maven-plugin/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt (69%) rename {kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb => kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin}/TestUtils.kt (94%) delete mode 100644 kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/TestUtils.kt rename kotlin-asyncapi-script/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/script/AsyncApiScript.kt (89%) rename kotlin-asyncapi-spring-web/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt (78%) rename kotlin-asyncapi-spring-web/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/AsyncApiController.kt (75%) rename kotlin-asyncapi-spring-web/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/AsyncApiProperties.kt (90%) rename kotlin-asyncapi-spring-web/src/main/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/EnableAsyncApi.kt (79%) create mode 100644 kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/TestUtils.kt rename kotlin-asyncapi-spring-web/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt (63%) rename kotlin-asyncapi-spring-web/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt (94%) rename kotlin-asyncapi-spring-web/src/test/kotlin/{org/openfolder => com/asyncapi}/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt (82%) diff --git a/README.md b/README.md index 800eefe..18b3089 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ![Logo](.github/assets/kotlin_asyncapi_logo.png) [![Apache License 2](https://img.shields.io/badge/license-ASF2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.txt) -[![Build status](https://github.com/OpenFolder/kotlin-asyncapi/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/OpenFolder/kotlin-asyncapi/actions/workflows/build.yml) -[![Qodana](https://github.com/OpenFolder/kotlin-asyncapi/actions/workflows/qodana.yml/badge.svg?branch=master)](https://openfolder.github.io/kotlin-asyncapi/qodana/report) -[![Maven Central status](https://img.shields.io/maven-central/v/org.openfolder/kotlin-asyncapi-parent.svg)](https://search.maven.org/#search%7Cga%7C1%7Corg.openfolder%20kotlin-asyncapi) +[![Build status](https://github.com/asyncapi/kotlin-asyncapi/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/asyncapi/kotlin-asyncapi/actions/workflows/build.yml) +[![Qodana](https://github.com/asyncapi/kotlin-asyncapi/actions/workflows/qodana.yml/badge.svg?branch=master)](https://asyncapi.github.io/kotlin-asyncapi/qodana/report) +[![Maven Central status](https://img.shields.io/maven-central/v/com.asyncapi/kotlin-asyncapi-parent.svg)](https://search.maven.org/#search%7Cga%7C1%7Ccom.asyncapi%20kotlin-asyncapi) > [!NOTE] > Spring Framework 6 / Spring Boot 3 is supported since `6.0.14` / `3.1.6` @@ -165,7 +165,7 @@ data class ChatMessage( ``` ```xml - org.openfolder + com.asyncapi kotlin-asyncapi-spring-web ${kotlin-asyncapi.version} @@ -225,7 +225,7 @@ data class ChatMessage( ``` ```xml - org.openfolder + com.asyncapi kotlin-asyncapi-ktor ${kotlin-asyncapi.version} @@ -275,7 +275,7 @@ servers { ``` ```xml - org.openfolder + com.asyncapi kotlin-asyncapi-maven-plugin ${kotlin-asyncapi.version} diff --git a/kotlin-asyncapi-annotation/pom.xml b/kotlin-asyncapi-annotation/pom.xml index 7de2b87..a85d830 100644 --- a/kotlin-asyncapi-annotation/pom.xml +++ b/kotlin-asyncapi-annotation/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openfolder + com.asyncapi kotlin-asyncapi-parent 3.0.4-SNAPSHOT diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiAnnotation.kt similarity index 62% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiAnnotation.kt index 17b6c6c..9e498c6 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiAnnotation.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiAnnotation.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation @Target(AnnotationTarget.ANNOTATION_CLASS) annotation class AsyncApiAnnotation diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/CorrelationID.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/CorrelationID.kt similarity index 73% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/CorrelationID.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/CorrelationID.kt index bba85d4..98a1fc1 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/CorrelationID.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/CorrelationID.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation annotation class CorrelationID( val isDefault: kotlin.Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/ExternalDocumentation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/ExternalDocumentation.kt similarity index 74% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/ExternalDocumentation.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/ExternalDocumentation.kt index dd7cbb8..a23ee2b 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/ExternalDocumentation.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/ExternalDocumentation.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation annotation class ExternalDocumentation( val isDefault: kotlin.Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Primitive.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Primitive.kt similarity index 80% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Primitive.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Primitive.kt index 3d93d4e..2436b59 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Primitive.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Primitive.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation annotation class Int( val value: kotlin.Int = 0, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Schema.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Schema.kt similarity index 97% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Schema.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Schema.kt index 3c23652..2286ee7 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Schema.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Schema.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation import kotlin.reflect.KClass diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Tag.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Tag.kt similarity index 81% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Tag.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Tag.kt index ffa02ef..58175c4 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/Tag.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/Tag.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation annotation class Tag( val isDefault: kotlin.Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Channel.kt similarity index 79% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Channel.kt index cf5a810..2e2e487 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Channel.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Channel.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiAnnotation @Target( AnnotationTarget.CLASS, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/ChannelBinding.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/ChannelBinding.kt similarity index 95% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/ChannelBinding.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/ChannelBinding.kt index 0b6c176..c3aa649 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/ChannelBinding.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/ChannelBinding.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.Boolean -import org.openfolder.kotlinasyncapi.annotation.Int -import org.openfolder.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Boolean +import com.asyncapi.kotlinasyncapi.annotation.Int +import com.asyncapi.kotlinasyncapi.annotation.Schema annotation class ChannelBindings( val isDefault: kotlin.Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Message.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Message.kt similarity index 71% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Message.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Message.kt index 0f34874..709e4eb 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Message.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Message.kt @@ -1,10 +1,10 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation -import org.openfolder.kotlinasyncapi.annotation.CorrelationID -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiAnnotation +import com.asyncapi.kotlinasyncapi.annotation.CorrelationID +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Tag import kotlin.reflect.KClass @Target( diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageBinding.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageBinding.kt similarity index 95% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageBinding.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageBinding.kt index aa2ee52..2d6b400 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageBinding.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageBinding.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.Int -import org.openfolder.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Int +import com.asyncapi.kotlinasyncapi.annotation.Schema annotation class MessageBindings( val isDefault: Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageExample.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageExample.kt similarity index 76% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageExample.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageExample.kt index 44297c7..f9a5325 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageExample.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageExample.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel annotation class MessageExample( val isDefault: Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageTrait.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageTrait.kt similarity index 69% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageTrait.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageTrait.kt index 665b522..ca8e5c5 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/MessageTrait.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/MessageTrait.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.CorrelationID -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.CorrelationID +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Tag annotation class MessageTrait( val isDefault: Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Operation.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Operation.kt similarity index 84% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Operation.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Operation.kt index 216c4a5..4dd706a 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Operation.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Operation.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiAnnotation +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Tag @Target( AnnotationTarget.FUNCTION, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/OperationBinding.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/OperationBinding.kt similarity index 95% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/OperationBinding.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/OperationBinding.kt index c2d75f7..0c1965f 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/OperationBinding.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/OperationBinding.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.Boolean -import org.openfolder.kotlinasyncapi.annotation.Int -import org.openfolder.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Boolean +import com.asyncapi.kotlinasyncapi.annotation.Int +import com.asyncapi.kotlinasyncapi.annotation.Schema annotation class OperationBindings( val isDefault: kotlin.Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/OperationTrait.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/OperationTrait.kt similarity index 67% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/OperationTrait.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/OperationTrait.kt index e9f472f..3d0b083 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/OperationTrait.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/OperationTrait.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Tag annotation class OperationTrait( val isDefault: Boolean = false, diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Parameter.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Parameter.kt similarity index 65% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Parameter.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Parameter.kt index 1d5cf12..1762bf6 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/Parameter.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/Parameter.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel -import org.openfolder.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Schema annotation class Parameter( val value: String = "", diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/SecurityRequirement.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/SecurityRequirement.kt similarity index 70% rename from kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/SecurityRequirement.kt rename to kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/SecurityRequirement.kt index e0ecd6c..0214b5a 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/channel/SecurityRequirement.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/channel/SecurityRequirement.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.annotation.channel +package com.asyncapi.kotlinasyncapi.annotation.channel annotation class SecurityRequirement( val key: String = "", diff --git a/kotlin-asyncapi-context/pom.xml b/kotlin-asyncapi-context/pom.xml index 5a2ce1e..655523c 100644 --- a/kotlin-asyncapi-context/pom.xml +++ b/kotlin-asyncapi-context/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openfolder + com.asyncapi kotlin-asyncapi-parent 3.0.4-SNAPSHOT @@ -16,15 +16,15 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-core - org.openfolder + com.asyncapi kotlin-asyncapi-script - org.openfolder + com.asyncapi kotlin-asyncapi-annotation diff --git a/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/AsyncApiContextProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/AsyncApiContextProvider.kt new file mode 100644 index 0000000..ff5c701 --- /dev/null +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/AsyncApiContextProvider.kt @@ -0,0 +1,8 @@ +package com.asyncapi.kotlinasyncapi.context + +import com.asyncapi.kotlinasyncapi.model.AsyncApi + +interface AsyncApiContextProvider { + + val asyncApi: AsyncApi? +} diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/PackageInfoProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/PackageInfoProvider.kt similarity index 80% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/PackageInfoProvider.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/PackageInfoProvider.kt index 42ce81c..27f6fe4 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/PackageInfoProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/PackageInfoProvider.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.context +package com.asyncapi.kotlinasyncapi.context -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi class PackageInfoProvider( private val applicationPackage: Package? diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/ResourceProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/ResourceProvider.kt similarity index 83% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/ResourceProvider.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/ResourceProvider.kt index 4e09946..9e85ee5 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/ResourceProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/ResourceProvider.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.context +package com.asyncapi.kotlinasyncapi.context import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi class ResourceProvider(path: String) : AsyncApiContextProvider { diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt similarity index 72% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt index c6f1c2f..b435d09 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -1,27 +1,27 @@ -package org.openfolder.kotlinasyncapi.context.annotation +package com.asyncapi.kotlinasyncapi.context.annotation -import org.openfolder.kotlinasyncapi.annotation.AsyncApiAnnotation -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.context.AsyncApiContextProvider -import org.openfolder.kotlinasyncapi.context.annotation.processor.AnnotationProcessor -import org.openfolder.kotlinasyncapi.model.AsyncApi -import org.openfolder.kotlinasyncapi.model.ReferencableCorrelationIDsMap -import org.openfolder.kotlinasyncapi.model.ReferencableSchemasMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableChannelBindingsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableChannelsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessageBindingsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessageTraitsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessagesMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableOperationBindingsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableOperationTraitsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableParametersMap -import org.openfolder.kotlinasyncapi.model.component.Components -import org.openfolder.kotlinasyncapi.model.component.ReferencableSecuritySchemasMap -import org.openfolder.kotlinasyncapi.model.server.ReferencableServerBindingsMap -import org.openfolder.kotlinasyncapi.model.server.ReferencableServerVariablesMap -import org.openfolder.kotlinasyncapi.model.server.ReferencableServersMap +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiAnnotation +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.context.AsyncApiContextProvider +import com.asyncapi.kotlinasyncapi.context.annotation.processor.AnnotationProcessor +import com.asyncapi.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.ReferencableCorrelationIDsMap +import com.asyncapi.kotlinasyncapi.model.ReferencableSchemasMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableChannelBindingsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableChannelsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessageBindingsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessageTraitsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessagesMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableOperationBindingsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableOperationTraitsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableParametersMap +import com.asyncapi.kotlinasyncapi.model.component.Components +import com.asyncapi.kotlinasyncapi.model.component.ReferencableSecuritySchemasMap +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServerBindingsMap +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServerVariablesMap +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServersMap import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationScanner.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationScanner.kt similarity index 94% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationScanner.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationScanner.kt index 7a2adc0..041da2e 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationScanner.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationScanner.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.context.annotation +package com.asyncapi.kotlinasyncapi.context.annotation import io.github.classgraph.ClassGraph import kotlin.reflect.KClass diff --git a/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt new file mode 100644 index 0000000..983e9cd --- /dev/null +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt @@ -0,0 +1,7 @@ +package com.asyncapi.kotlinasyncapi.context.annotation.processor + +import com.asyncapi.kotlinasyncapi.model.component.Components + +interface AnnotationProcessor { + fun process(annotation: T, context: U): Components +} diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt similarity index 76% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt index 5ba68e5..b010764 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ChannelProcessor.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Publish -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.model.component.Components +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Publish +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.functions diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt similarity index 82% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt index aa1e828..4456956 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ConverterUtils.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor import com.fasterxml.jackson.module.kotlin.registerKotlinModule import io.swagger.v3.core.converter.ModelConverters diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MappingUtils.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MappingUtils.kt similarity index 70% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MappingUtils.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MappingUtils.kt index a845276..2215f40 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MappingUtils.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MappingUtils.kt @@ -1,43 +1,43 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import org.openfolder.kotlinasyncapi.annotation.CorrelationID -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.SchemaMapEntry -import org.openfolder.kotlinasyncapi.annotation.Tag -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.ChannelBinding -import org.openfolder.kotlinasyncapi.annotation.channel.ChannelBindings -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.MessageBinding -import org.openfolder.kotlinasyncapi.annotation.channel.MessageBindings -import org.openfolder.kotlinasyncapi.annotation.channel.MessageExample -import org.openfolder.kotlinasyncapi.annotation.channel.MessageTrait -import org.openfolder.kotlinasyncapi.annotation.channel.OperationBinding -import org.openfolder.kotlinasyncapi.annotation.channel.OperationBindings -import org.openfolder.kotlinasyncapi.annotation.channel.OperationTrait -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.Publish -import org.openfolder.kotlinasyncapi.annotation.channel.SecurityRequirement -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.model.ReferencableSchemasList -import org.openfolder.kotlinasyncapi.model.ReferencableSchemasMap -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.TagsList -import org.openfolder.kotlinasyncapi.model.channel.MessageExamplesList -import org.openfolder.kotlinasyncapi.model.channel.MessageTraitsList -import org.openfolder.kotlinasyncapi.model.channel.OneOfReferencableMessages -import org.openfolder.kotlinasyncapi.model.channel.Operation -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessagesList -import org.openfolder.kotlinasyncapi.model.channel.ReferencableOperationTraitsList -import org.openfolder.kotlinasyncapi.model.channel.ReferencableParametersMap -import org.openfolder.kotlinasyncapi.model.server.SecurityRequirementsList +import com.asyncapi.kotlinasyncapi.annotation.CorrelationID +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.SchemaMapEntry +import com.asyncapi.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.ChannelBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.ChannelBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageExample +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageTrait +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationTrait +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.Publish +import com.asyncapi.kotlinasyncapi.annotation.channel.SecurityRequirement +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.model.ReferencableSchemasList +import com.asyncapi.kotlinasyncapi.model.ReferencableSchemasMap +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.TagsList +import com.asyncapi.kotlinasyncapi.model.channel.MessageExamplesList +import com.asyncapi.kotlinasyncapi.model.channel.MessageTraitsList +import com.asyncapi.kotlinasyncapi.model.channel.OneOfReferencableMessages +import com.asyncapi.kotlinasyncapi.model.channel.Operation +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessagesList +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableOperationTraitsList +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableParametersMap +import com.asyncapi.kotlinasyncapi.model.server.SecurityRequirementsList import java.util.AbstractMap -internal fun Message.toMessage(): org.openfolder.kotlinasyncapi.model.channel.Message = - org.openfolder.kotlinasyncapi.model.channel.Message().apply { +internal fun Message.toMessage(): com.asyncapi.kotlinasyncapi.model.channel.Message = + com.asyncapi.kotlinasyncapi.model.channel.Message().apply { messageId = this@toMessage.messageId.takeIf { it.isNotEmpty() } schemaFormat = this@toMessage.schemaFormat.takeIf { it.isNotEmpty() } contentType = this@toMessage.contentType.takeIf { it.isNotEmpty() } @@ -58,8 +58,8 @@ internal fun Message.toMessage(): org.openfolder.kotlinasyncapi.model.channel.Me internal fun Message.toMessageOrReference(): Any = value.takeUnless { it == Void::class }?.let { toReference() } ?: toMessage() -internal fun Schema.toSchema(): org.openfolder.kotlinasyncapi.model.Schema = - org.openfolder.kotlinasyncapi.model.Schema().apply { +internal fun Schema.toSchema(): com.asyncapi.kotlinasyncapi.model.Schema = + com.asyncapi.kotlinasyncapi.model.Schema().apply { val objectMapper = ObjectMapper() title = this@toSchema.title.takeIf { it.isNotEmpty() } @@ -145,27 +145,27 @@ internal fun Array.toMessageTraitsList(): MessageTraitsList = addAll(this@toMessageTraitsList.map { it.toMessageTrait() }) } -internal fun CorrelationID.toCorrelationID(): org.openfolder.kotlinasyncapi.model.CorrelationID = - org.openfolder.kotlinasyncapi.model.CorrelationID().apply { +internal fun CorrelationID.toCorrelationID(): com.asyncapi.kotlinasyncapi.model.CorrelationID = + com.asyncapi.kotlinasyncapi.model.CorrelationID().apply { location = this@toCorrelationID.location description = this@toCorrelationID.description.takeIf { it.isNotEmpty() } } -internal fun ExternalDocumentation.toExternalDocumentation(): org.openfolder.kotlinasyncapi.model.ExternalDocumentation = - org.openfolder.kotlinasyncapi.model.ExternalDocumentation().apply { +internal fun ExternalDocumentation.toExternalDocumentation(): com.asyncapi.kotlinasyncapi.model.ExternalDocumentation = + com.asyncapi.kotlinasyncapi.model.ExternalDocumentation().apply { url = this@toExternalDocumentation.url description = this@toExternalDocumentation.description.takeIf { it.isNotEmpty() } } -internal fun Tag.toTag(): org.openfolder.kotlinasyncapi.model.Tag = - org.openfolder.kotlinasyncapi.model.Tag().apply { +internal fun Tag.toTag(): com.asyncapi.kotlinasyncapi.model.Tag = + com.asyncapi.kotlinasyncapi.model.Tag().apply { name = this@toTag.name description = this@toTag.description.takeIf { it.isNotEmpty() } externalDocs = this@toTag.externalDocs.takeUnless { it.isDefault }?.toExternalDocumentation() } -internal fun MessageExample.toMessageExample(): org.openfolder.kotlinasyncapi.model.channel.MessageExample = - org.openfolder.kotlinasyncapi.model.channel.MessageExample().apply { +internal fun MessageExample.toMessageExample(): com.asyncapi.kotlinasyncapi.model.channel.MessageExample = + com.asyncapi.kotlinasyncapi.model.channel.MessageExample().apply { val objectMapper = ObjectMapper() name = this@toMessageExample.name.takeIf { it.isNotEmpty() } @@ -178,8 +178,8 @@ internal fun MessageExample.toMessageExample(): org.openfolder.kotlinasyncapi.mo } } -internal fun MessageBindings.toMessageBindings(): org.openfolder.kotlinasyncapi.model.channel.MessageBindings = - org.openfolder.kotlinasyncapi.model.channel.MessageBindings().apply { +internal fun MessageBindings.toMessageBindings(): com.asyncapi.kotlinasyncapi.model.channel.MessageBindings = + com.asyncapi.kotlinasyncapi.model.channel.MessageBindings().apply { http = this@toMessageBindings.http.takeUnless { it.isDefault }?.toHTTP() kafka = this@toMessageBindings.kafka.takeUnless { it.isDefault }?.toKafka() anypointmq = this@toMessageBindings.anypointmq.takeUnless { it.isDefault }?.toAnypointMQ() @@ -188,8 +188,8 @@ internal fun MessageBindings.toMessageBindings(): org.openfolder.kotlinasyncapi. ibmmq = this@toMessageBindings.ibmmq.takeUnless { it.isDefault }?.toIBMMQ() } -internal fun MessageTrait.toMessageTrait(): org.openfolder.kotlinasyncapi.model.channel.MessageTrait = - org.openfolder.kotlinasyncapi.model.channel.MessageTrait().apply { +internal fun MessageTrait.toMessageTrait(): com.asyncapi.kotlinasyncapi.model.channel.MessageTrait = + com.asyncapi.kotlinasyncapi.model.channel.MessageTrait().apply { messageId = this@toMessageTrait.messageId.takeIf { it.isNotEmpty() } schemaFormat = this@toMessageTrait.schemaFormat.takeIf { it.isNotEmpty() } contentType = this@toMessageTrait.contentType.takeIf { it.isNotEmpty() } @@ -205,38 +205,38 @@ internal fun MessageTrait.toMessageTrait(): org.openfolder.kotlinasyncapi.model. headers = this@toMessageTrait.headers.takeUnless { it.isDefault }?.toSchemaOrReference() } -internal fun MessageBinding.HTTP.toHTTP(): org.openfolder.kotlinasyncapi.model.channel.MessageBinding.HTTP = - org.openfolder.kotlinasyncapi.model.channel.MessageBinding.HTTP().apply { +internal fun MessageBinding.HTTP.toHTTP(): com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.HTTP = + com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.HTTP().apply { bindingVersion = this@toHTTP.bindingVersion.takeIf { it.isNotEmpty() } headers = this@toHTTP.headers.takeUnless { it.isDefault }?.toSchemaOrReference() } -internal fun MessageBinding.Kafka.toKafka(): org.openfolder.kotlinasyncapi.model.channel.MessageBinding.Kafka = - org.openfolder.kotlinasyncapi.model.channel.MessageBinding.Kafka().apply { +internal fun MessageBinding.Kafka.toKafka(): com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.Kafka = + com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.Kafka().apply { bindingVersion = this@toKafka.bindingVersion.takeIf { it.isNotEmpty() } key = this@toKafka.key.takeUnless { it.isDefault }?.toSchemaOrReference() } -internal fun MessageBinding.AnypointMQ.toAnypointMQ(): org.openfolder.kotlinasyncapi.model.channel.MessageBinding.AnypointMQ = - org.openfolder.kotlinasyncapi.model.channel.MessageBinding.AnypointMQ().apply { +internal fun MessageBinding.AnypointMQ.toAnypointMQ(): com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.AnypointMQ = + com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.AnypointMQ().apply { bindingVersion = this@toAnypointMQ.bindingVersion.takeIf { it.isNotEmpty() } headers = this@toAnypointMQ.headers.takeUnless { it.isDefault }?.toSchemaOrReference() } -internal fun MessageBinding.AMQP.toAMQP(): org.openfolder.kotlinasyncapi.model.channel.MessageBinding.AMQP = - org.openfolder.kotlinasyncapi.model.channel.MessageBinding.AMQP().apply { +internal fun MessageBinding.AMQP.toAMQP(): com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.AMQP = + com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.AMQP().apply { bindingVersion = this@toAMQP.bindingVersion.takeIf { it.isNotEmpty() } messageType = this@toAMQP.messageType.takeIf { it.isNotEmpty() } contentEncoding = this@toAMQP.contentEncoding.takeIf { it.isNotEmpty() } } -internal fun MessageBinding.MQTT.toMQTT(): org.openfolder.kotlinasyncapi.model.channel.MessageBinding.MQTT = - org.openfolder.kotlinasyncapi.model.channel.MessageBinding.MQTT().apply { +internal fun MessageBinding.MQTT.toMQTT(): com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.MQTT = + com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.MQTT().apply { bindingVersion = this@toMQTT.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun MessageBinding.IBMMQ.toIBMMQ(): org.openfolder.kotlinasyncapi.model.channel.MessageBinding.IBMMQ = - org.openfolder.kotlinasyncapi.model.channel.MessageBinding.IBMMQ().apply { +internal fun MessageBinding.IBMMQ.toIBMMQ(): com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.IBMMQ = + com.asyncapi.kotlinasyncapi.model.channel.MessageBinding.IBMMQ().apply { bindingVersion = this@toIBMMQ.bindingVersion.takeIf { it.isNotEmpty() } type = this@toIBMMQ.type.takeIf { it.isNotEmpty() } description = this@toIBMMQ.description.takeIf { it.isNotEmpty() } @@ -244,8 +244,8 @@ internal fun MessageBinding.IBMMQ.toIBMMQ(): org.openfolder.kotlinasyncapi.model headers = this@toIBMMQ.headers.takeIf { it.isNotEmpty() } } -internal fun Channel.toChannel(): org.openfolder.kotlinasyncapi.model.channel.Channel = - org.openfolder.kotlinasyncapi.model.channel.Channel().apply { +internal fun Channel.toChannel(): com.asyncapi.kotlinasyncapi.model.channel.Channel = + com.asyncapi.kotlinasyncapi.model.channel.Channel().apply { description = this@toChannel.description.takeIf { it.isNotEmpty() } servers = this@toChannel.servers.takeIf { it.isNotEmpty() }?.toList() subscribe = this@toChannel.subscribe.takeUnless { it.isDefault }?.toOperation() @@ -307,8 +307,8 @@ internal fun Array.toReferencableOperationTraitsList(): Referenc addAll(this@toReferencableOperationTraitsList.map { it.toOperationTrait() }) } -internal fun OperationTrait.toOperationTrait(): org.openfolder.kotlinasyncapi.model.channel.OperationTrait = - org.openfolder.kotlinasyncapi.model.channel.OperationTrait().apply { +internal fun OperationTrait.toOperationTrait(): com.asyncapi.kotlinasyncapi.model.channel.OperationTrait = + com.asyncapi.kotlinasyncapi.model.channel.OperationTrait().apply { operationId = this@toOperationTrait.operationId.takeIf { it.isNotEmpty() } summary = this@toOperationTrait.summary.takeIf { it.isNotEmpty() } description = this@toOperationTrait.description.takeIf { it.isNotEmpty() } @@ -317,8 +317,8 @@ internal fun OperationTrait.toOperationTrait(): org.openfolder.kotlinasyncapi.mo bindings = this@toOperationTrait.bindings.takeUnless { it.isDefault }?.toOperationBindings() } -internal fun OperationBindings.toOperationBindings(): org.openfolder.kotlinasyncapi.model.channel.OperationBindings = - org.openfolder.kotlinasyncapi.model.channel.OperationBindings().apply { +internal fun OperationBindings.toOperationBindings(): com.asyncapi.kotlinasyncapi.model.channel.OperationBindings = + com.asyncapi.kotlinasyncapi.model.channel.OperationBindings().apply { http = this@toOperationBindings.http.takeUnless { it.isDefault }?.toHTTP() kafka = this@toOperationBindings.kafka.takeUnless { it.isDefault }?.toKafka() amqp = this@toOperationBindings.amqp.takeUnless { it.isDefault }?.toAMQP() @@ -327,22 +327,22 @@ internal fun OperationBindings.toOperationBindings(): org.openfolder.kotlinasync solace = this@toOperationBindings.solace.takeUnless { it.isDefault }?.toSolace() } -internal fun OperationBinding.HTTP.toHTTP(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.HTTP = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.HTTP().apply { +internal fun OperationBinding.HTTP.toHTTP(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.HTTP = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.HTTP().apply { method = this@toHTTP.method.takeIf { it.isNotEmpty() } query = this@toHTTP.query.takeUnless { it.isDefault }?.toSchemaOrReference() bindingVersion = this@toHTTP.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun OperationBinding.Kafka.toKafka(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Kafka = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Kafka().apply { +internal fun OperationBinding.Kafka.toKafka(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Kafka = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Kafka().apply { groupId = this@toKafka.groupId.takeUnless { it.isDefault }?.toSchemaOrReference() clientId = this@toKafka.clientId.takeUnless { it.isDefault }?.toSchemaOrReference() bindingVersion = this@toKafka.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun OperationBinding.AMQP.toAMQP(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.AMQP = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.AMQP().apply { +internal fun OperationBinding.AMQP.toAMQP(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.AMQP = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.AMQP().apply { expiration = this@toAMQP.expiration.takeUnless { it.isDefault }?.value userId = this@toAMQP.userId.takeIf { it.isNotEmpty() } cc = this@toAMQP.cc.takeIf { it.isNotEmpty() }?.toList() @@ -356,47 +356,47 @@ internal fun OperationBinding.AMQP.toAMQP(): org.openfolder.kotlinasyncapi.model bindingVersion = this@toAMQP.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun OperationBinding.MQTT.toMQTT(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.MQTT = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.MQTT().apply { +internal fun OperationBinding.MQTT.toMQTT(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.MQTT = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.MQTT().apply { qos = this@toMQTT.qos.takeUnless { it.isDefault }?.value retain = this@toMQTT.retain.takeUnless { it.isDefault }?.value bindingVersion = this@toMQTT.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun OperationBinding.NATS.toNATS(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.NATS = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.NATS().apply { +internal fun OperationBinding.NATS.toNATS(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.NATS = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.NATS().apply { queue = this@toNATS.queue.takeIf { it.isNotEmpty() } bindingVersion = this@toNATS.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun OperationBinding.Solace.toSolace(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace().apply { +internal fun OperationBinding.Solace.toSolace(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace().apply { bindingVersion = this@toSolace.bindingVersion.takeIf { it.isNotEmpty() } destinations = this@toSolace.destinations.takeIf { it.isNotEmpty() }?.toSolaceDestinationsList() } -internal fun Array.toSolaceDestinationsList(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.DestinationsList = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.DestinationsList().apply { +internal fun Array.toSolaceDestinationsList(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.DestinationsList = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.DestinationsList().apply { addAll(this@toSolaceDestinationsList.map { it.toSolaceDestination() }) } -internal fun OperationBinding.SolaceDestination.toSolaceDestination(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.Destination = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.Destination().apply { +internal fun OperationBinding.SolaceDestination.toSolaceDestination(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.Destination = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.Destination().apply { destinationType = this@toSolaceDestination.destinationType.takeIf { it.isNotEmpty() } deliveryMode = this@toSolaceDestination.deliveryMode.takeIf { it.isNotEmpty() } queue = this@toSolaceDestination.queue.takeUnless { it.isDefault }?.toSolaceDestinationQueue() topic = this@toSolaceDestination.topic.takeUnless { it.isDefault }?.toSolaceDestinationTopic() } -internal fun OperationBinding.SolaceDestinationQueue.toSolaceDestinationQueue(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.Queue = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.Queue().apply { +internal fun OperationBinding.SolaceDestinationQueue.toSolaceDestinationQueue(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.Queue = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.Queue().apply { name = this@toSolaceDestinationQueue.name.takeIf { it.isNotEmpty() } topicSubscriptions = this@toSolaceDestinationQueue.topicSubscriptions.takeIf { it.isNotEmpty() }?.toList() accessType = this@toSolaceDestinationQueue.accessType.takeIf { it.isNotEmpty() } } -internal fun OperationBinding.SolaceDestinationTopic.toSolaceDestinationTopic(): org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.Topic = - org.openfolder.kotlinasyncapi.model.channel.OperationBinding.Solace.Topic().apply { +internal fun OperationBinding.SolaceDestinationTopic.toSolaceDestinationTopic(): com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.Topic = + com.asyncapi.kotlinasyncapi.model.channel.OperationBinding.Solace.Topic().apply { topicSubscriptions = this@toSolaceDestinationTopic.topicSubscriptions.takeIf { it.isNotEmpty() }?.toList() } @@ -410,46 +410,46 @@ internal fun Array.toReferencableParametersMap(): ReferencableParamet putAll(this@toReferencableParametersMap.map { it.value to it.toParameter() }) } -internal fun Parameter.toParameter(): org.openfolder.kotlinasyncapi.model.channel.Parameter = - org.openfolder.kotlinasyncapi.model.channel.Parameter().apply { +internal fun Parameter.toParameter(): com.asyncapi.kotlinasyncapi.model.channel.Parameter = + com.asyncapi.kotlinasyncapi.model.channel.Parameter().apply { description = this@toParameter.description.takeIf { it.isNotEmpty() } location = this@toParameter.location.takeIf { it.isNotEmpty() } schema = this@toParameter.schema.takeUnless { it.isDefault }?.toSchemaOrReference() } -internal fun ChannelBindings.toChannelBindings(): org.openfolder.kotlinasyncapi.model.channel.ChannelBindings = - org.openfolder.kotlinasyncapi.model.channel.ChannelBindings().apply { +internal fun ChannelBindings.toChannelBindings(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBindings = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBindings().apply { ws = this@toChannelBindings.ws.takeUnless { it.isDefault }?.toWebSockets() anypointmq = this@toChannelBindings.anypointmq.takeUnless { it.isDefault }?.toAnypointMQ() amqp = this@toChannelBindings.amqp.takeUnless { it.isDefault }?.toAMQP() ibmmq = this@toChannelBindings.ibmmq.takeUnless { it.isDefault }?.toIBMMQ() } -internal fun ChannelBinding.WebSockets.toWebSockets(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.WebSockets = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.WebSockets().apply { +internal fun ChannelBinding.WebSockets.toWebSockets(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.WebSockets = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.WebSockets().apply { method = this@toWebSockets.method.takeIf { it.isNotEmpty() } query = this@toWebSockets.query.takeUnless { it.isDefault }?.toSchemaOrReference() headers = this@toWebSockets.headers.takeUnless { it.isDefault }?.toSchemaOrReference() bindingVersion = this@toWebSockets.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun ChannelBinding.AnypointMQ.toAnypointMQ(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AnypointMQ = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AnypointMQ().apply { +internal fun ChannelBinding.AnypointMQ.toAnypointMQ(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AnypointMQ = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AnypointMQ().apply { destination = this@toAnypointMQ.destination.takeIf { it.isNotEmpty() } destinationType = this@toAnypointMQ.destinationType.takeIf { it.isNotEmpty() } bindingVersion = this@toAnypointMQ.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun ChannelBinding.AMQP.toAMQP(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AMQP = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AMQP().apply { +internal fun ChannelBinding.AMQP.toAMQP(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AMQP = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AMQP().apply { `is` = this@toAMQP.`is`.takeIf { it.isNotEmpty() } exchange = this@toAMQP.exchange.takeUnless { it.isDefault }?.toAMQPExchange() queue = this@toAMQP.queue.takeUnless { it.isDefault }?.toAMQPQueue() bindingVersion = this@toAMQP.bindingVersion.takeIf { it.isNotEmpty() } } -internal fun ChannelBinding.AMQPExchange.toAMQPExchange(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Exchange = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Exchange().apply { +internal fun ChannelBinding.AMQPExchange.toAMQPExchange(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Exchange = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Exchange().apply { name = this@toAMQPExchange.name.takeIf { it.isNotEmpty() } type = this@toAMQPExchange.type.takeIf { it.isNotEmpty() } vhost = this@toAMQPExchange.vhost.takeIf { it.isNotEmpty() } @@ -457,8 +457,8 @@ internal fun ChannelBinding.AMQPExchange.toAMQPExchange(): org.openfolder.kotlin autoDelete = this@toAMQPExchange.autoDelete.takeUnless { it.isDefault }?.value } -internal fun ChannelBinding.AMQPQueue.toAMQPQueue(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Queue = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Queue().apply { +internal fun ChannelBinding.AMQPQueue.toAMQPQueue(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Queue = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.AMQP.Queue().apply { name = this@toAMQPQueue.name.takeIf { it.isNotEmpty() } type = this@toAMQPQueue.type.takeIf { it.isNotEmpty() } vhost = this@toAMQPQueue.vhost.takeIf { it.isNotEmpty() } @@ -467,8 +467,8 @@ internal fun ChannelBinding.AMQPQueue.toAMQPQueue(): org.openfolder.kotlinasynca autoDelete = this@toAMQPQueue.autoDelete.takeUnless { it.isDefault }?.value } -internal fun ChannelBinding.IBMMQ.toIBMMQ(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ().apply { +internal fun ChannelBinding.IBMMQ.toIBMMQ(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ().apply { destinationType = this@toIBMMQ.destinationType.takeIf { it.isNotEmpty() } bindingVersion = this@toIBMMQ.bindingVersion.takeIf { it.isNotEmpty() } maxMsgLength = this@toIBMMQ.maxMsgLength.takeUnless { it.isDefault }?.value @@ -476,15 +476,15 @@ internal fun ChannelBinding.IBMMQ.toIBMMQ(): org.openfolder.kotlinasyncapi.model topic = this@toIBMMQ.topic.takeUnless { it.isDefault }?.toIBMMQTopic() } -internal fun ChannelBinding.IBMMQQueue.toIBMMQQueue(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Queue = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Queue().apply { +internal fun ChannelBinding.IBMMQQueue.toIBMMQQueue(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Queue = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Queue().apply { objectName = this@toIBMMQQueue.objectName isPartitioned = this@toIBMMQQueue.isPartitioned.takeUnless { it.isDefault }?.value exclusive = this@toIBMMQQueue.exclusive.takeUnless { it.isDefault }?.value } -internal fun ChannelBinding.IBMMQTopic.toIBMMQTopic(): org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Topic = - org.openfolder.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Topic().apply { +internal fun ChannelBinding.IBMMQTopic.toIBMMQTopic(): com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Topic = + com.asyncapi.kotlinasyncapi.model.channel.ChannelBinding.IBMMQ.Topic().apply { string = this@toIBMMQTopic.string.takeIf { it.isNotEmpty() } objectName = this@toIBMMQTopic.objectName.takeIf { it.isNotEmpty() } durablePermitted = this@toIBMMQTopic.durablePermitted.takeUnless { it.isDefault }?.value diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt similarity index 77% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt index c9ff980..eeb9953 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MessageProcessor.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.component.Components +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass class MessageProcessor : AnnotationProcessor> { diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt similarity index 66% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt index 348d614..8c4c859 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/SchemaProcessor.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.model.component.Components +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass class SchemaProcessor : AnnotationProcessor> { diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiExtension.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiExtension.kt similarity index 95% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiExtension.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiExtension.kt index 685e271..3c5f0fd 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiExtension.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiExtension.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.context.service +package com.asyncapi.kotlinasyncapi.context.service -import org.openfolder.kotlinasyncapi.model.AsyncApi -import org.openfolder.kotlinasyncapi.script.AsyncApiScript +import com.asyncapi.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.script.AsyncApiScript import kotlin.script.experimental.api.SourceCode import kotlin.script.experimental.api.implicitReceivers import kotlin.script.experimental.jvm.jvm diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiSerializer.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiSerializer.kt similarity index 84% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiSerializer.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiSerializer.kt index 03b5efb..a129c15 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiSerializer.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiSerializer.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.context.service +package com.asyncapi.kotlinasyncapi.context.service import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.registerKotlinModule -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi fun interface AsyncApiSerializer { diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiService.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiService.kt similarity index 79% rename from kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiService.kt rename to kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiService.kt index 7d05d0b..b89d64c 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiService.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiService.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.context.service +package com.asyncapi.kotlinasyncapi.context.service -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi interface AsyncApiService { diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/AsyncApiContextProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/AsyncApiContextProvider.kt deleted file mode 100644 index 971a555..0000000 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/AsyncApiContextProvider.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.openfolder.kotlinasyncapi.context - -import org.openfolder.kotlinasyncapi.model.AsyncApi - -interface AsyncApiContextProvider { - - val asyncApi: AsyncApi? -} diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt deleted file mode 100644 index 86443e9..0000000 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AnnotationProcessor.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor - -import org.openfolder.kotlinasyncapi.model.component.Components - -interface AnnotationProcessor { - fun process(annotation: T, context: U): Components -} diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/TestUtils.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/TestUtils.kt similarity index 94% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/TestUtils.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/TestUtils.kt index 1d248d3..7adeda5 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/TestUtils.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/TestUtils.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.context import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt similarity index 74% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt index 34bc22b..843b380 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/ChannelProcessorTest.kt @@ -1,15 +1,15 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.Tag -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.Publish -import org.openfolder.kotlinasyncapi.annotation.channel.SecurityRequirement -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.context.TestUtils.json +import com.asyncapi.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.Publish +import com.asyncapi.kotlinasyncapi.annotation.channel.SecurityRequirement +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.context.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation internal class ChannelProcessorTest { diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt similarity index 70% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt index af7c4a1..8cc5ab3 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/MessageProcessorTest.kt @@ -1,11 +1,11 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.Tag -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.context.TestUtils.json +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.context.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation internal class MessageProcessorTest { diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt similarity index 74% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt index 751e861..abf3ac8 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/SchemaProcessorTest.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.context.TestUtils.json +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.context.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation internal class SchemaProcessorTest { diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt similarity index 96% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt index 2b70b78..d39c45f 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/AsyncApiExtensionTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.context.service +package com.asyncapi.kotlinasyncapi.context.service import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi import kotlin.script.experimental.host.toScriptSource internal class AsyncApiExtensionTest { diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt similarity index 85% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt index 45fe0bf..babbecd 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/DefaultAsyncApiSerializerTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.context.service +package com.asyncapi.kotlinasyncapi.context.service import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.context.TestUtils.json -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.context.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.AsyncApi import org.skyscreamer.jsonassert.JSONAssert import org.skyscreamer.jsonassert.JSONCompareMode diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt similarity index 94% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt rename to kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt index 2a53086..38dfc00 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/service/DefaultAsyncApiServiceTest.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.context.service +package com.asyncapi.kotlinasyncapi.context.service import io.mockk.every import io.mockk.junit5.MockKExtension @@ -7,7 +7,7 @@ import io.mockk.slot import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi @ExtendWith(MockKExtension::class) internal class DefaultAsyncApiServiceTest { diff --git a/kotlin-asyncapi-core/pom.xml b/kotlin-asyncapi-core/pom.xml index 15ff8a8..c8711a1 100644 --- a/kotlin-asyncapi-core/pom.xml +++ b/kotlin-asyncapi-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openfolder + com.asyncapi kotlin-asyncapi-parent 3.0.4-SNAPSHOT diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApi.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApi.kt similarity index 84% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApi.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApi.kt index 2279e77..0da9792 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApi.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApi.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model -import org.openfolder.kotlinasyncapi.model.channel.ReferencableChannelsMap -import org.openfolder.kotlinasyncapi.model.component.Components -import org.openfolder.kotlinasyncapi.model.info.Info -import org.openfolder.kotlinasyncapi.model.server.ReferencableServersMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableChannelsMap +import com.asyncapi.kotlinasyncapi.model.component.Components +import com.asyncapi.kotlinasyncapi.model.info.Info +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServersMap @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPEALIAS) @DslMarker diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/CorrelationID.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/CorrelationID.kt similarity index 93% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/CorrelationID.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/CorrelationID.kt index a50d921..2de05ba 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/CorrelationID.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/CorrelationID.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model @AsyncApiComponent class ReferencableCorrelationIDsMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/ExternalDocumentation.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/ExternalDocumentation.kt similarity index 86% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/ExternalDocumentation.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/ExternalDocumentation.kt index d324f69..b03ea42 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/ExternalDocumentation.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/ExternalDocumentation.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model @AsyncApiComponent class ExternalDocumentation { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Reference.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Reference.kt similarity index 76% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Reference.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Reference.kt index 23df293..c7159e6 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Reference.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Reference.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model @AsyncApiComponent class Reference { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Schema.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Schema.kt similarity index 99% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Schema.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Schema.kt index aa2fa5e..0eb2773 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Schema.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Schema.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model @AsyncApiComponent class ReferencableSchemasList : ArrayList() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Tag.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Tag.kt similarity index 93% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Tag.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Tag.kt index 3dc8eb7..ddeecd1 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/Tag.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/Tag.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model @AsyncApiComponent class TagsList : ArrayList() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Channel.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Channel.kt similarity index 91% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Channel.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Channel.kt index d879d8d..2652e11 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Channel.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Channel.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference @AsyncApiComponent class ReferencableChannelsMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelBinding.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelBinding.kt similarity index 97% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelBinding.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelBinding.kt index 0439cb1..70d3779 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelBinding.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelBinding.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.Schema +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.Schema @AsyncApiComponent class ReferencableChannelBindingsMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Message.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Message.kt similarity index 90% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Message.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Message.kt index 93b7b2b..cd8fcfc 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Message.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Message.kt @@ -1,11 +1,11 @@ -package org.openfolder.kotlinasyncapi.model.channel - -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.CorrelationID -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.Schema -import org.openfolder.kotlinasyncapi.model.TagsList +package com.asyncapi.kotlinasyncapi.model.channel + +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.CorrelationID +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.Schema +import com.asyncapi.kotlinasyncapi.model.TagsList @AsyncApiComponent class ReferencableMessagesList : ArrayList() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageBinding.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageBinding.kt similarity index 96% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageBinding.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageBinding.kt index 72fd1ec..4598763 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageBinding.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageBinding.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.Schema +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.Schema @AsyncApiComponent class ReferencableMessageBindingsMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageExample.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageExample.kt similarity index 86% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageExample.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageExample.kt index a4093b9..0daa8d8 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageExample.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageExample.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent @AsyncApiComponent class MessageExamplesList : ArrayList() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTrait.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTrait.kt similarity index 87% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTrait.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTrait.kt index e7c0243..70bc52c 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTrait.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTrait.kt @@ -1,11 +1,11 @@ -package org.openfolder.kotlinasyncapi.model.channel - -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.CorrelationID -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.Schema -import org.openfolder.kotlinasyncapi.model.TagsList +package com.asyncapi.kotlinasyncapi.model.channel + +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.CorrelationID +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.Schema +import com.asyncapi.kotlinasyncapi.model.TagsList @AsyncApiComponent class MessageTraitsList : ArrayList() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Operation.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Operation.kt similarity index 84% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Operation.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Operation.kt index b83a8d0..dbdc36a 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Operation.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Operation.kt @@ -1,10 +1,10 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.TagsList -import org.openfolder.kotlinasyncapi.model.server.SecurityRequirementsList +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.TagsList +import com.asyncapi.kotlinasyncapi.model.server.SecurityRequirementsList @AsyncApiComponent class Operation { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationBinding.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationBinding.kt similarity index 97% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationBinding.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationBinding.kt index 77413b2..4b13e8f 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationBinding.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationBinding.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.Schema +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.Schema @AsyncApiComponent class ReferencableOperationBindingsMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTrait.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTrait.kt similarity index 86% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTrait.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTrait.kt index cf23cab..e9fd470 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTrait.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTrait.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.TagsList +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.TagsList @AsyncApiComponent class ReferencableOperationTraitsList : ArrayList() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Parameter.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Parameter.kt similarity index 80% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Parameter.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Parameter.kt index e7b97e4..7b6cf9f 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/channel/Parameter.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/channel/Parameter.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference -import org.openfolder.kotlinasyncapi.model.Schema +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.Schema @AsyncApiComponent class ReferencableParametersMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/Components.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/Components.kt similarity index 75% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/Components.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/Components.kt index 5453347..82052cc 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/Components.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/Components.kt @@ -1,19 +1,19 @@ -package org.openfolder.kotlinasyncapi.model.component - -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.ReferencableCorrelationIDsMap -import org.openfolder.kotlinasyncapi.model.ReferencableSchemasMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableChannelBindingsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableChannelsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessageBindingsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessageTraitsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableMessagesMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableOperationBindingsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableOperationTraitsMap -import org.openfolder.kotlinasyncapi.model.channel.ReferencableParametersMap -import org.openfolder.kotlinasyncapi.model.server.ReferencableServerBindingsMap -import org.openfolder.kotlinasyncapi.model.server.ReferencableServerVariablesMap -import org.openfolder.kotlinasyncapi.model.server.ReferencableServersMap +package com.asyncapi.kotlinasyncapi.model.component + +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.ReferencableCorrelationIDsMap +import com.asyncapi.kotlinasyncapi.model.ReferencableSchemasMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableChannelBindingsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableChannelsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessageBindingsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessageTraitsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableMessagesMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableOperationBindingsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableOperationTraitsMap +import com.asyncapi.kotlinasyncapi.model.channel.ReferencableParametersMap +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServerBindingsMap +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServerVariablesMap +import com.asyncapi.kotlinasyncapi.model.server.ReferencableServersMap @AsyncApiComponent class Components { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/OAuthFlows.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/OAuthFlows.kt similarity index 91% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/OAuthFlows.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/OAuthFlows.kt index 1aa1085..61789a7 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/OAuthFlows.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/OAuthFlows.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.model.component +package com.asyncapi.kotlinasyncapi.model.component -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent @AsyncApiComponent class OAuthFlows { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/SecuritySchema.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/SecuritySchema.kt similarity index 89% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/SecuritySchema.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/SecuritySchema.kt index 2e58e3a..5723fa7 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/component/SecuritySchema.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/component/SecuritySchema.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.model.component +package com.asyncapi.kotlinasyncapi.model.component -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference @AsyncApiComponent class ReferencableSecuritySchemasMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/Contact.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/Contact.kt similarity index 75% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/Contact.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/Contact.kt index e9eec71..59bf64d 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/Contact.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/Contact.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.model.info +package com.asyncapi.kotlinasyncapi.model.info -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent @AsyncApiComponent class Contact { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/Info.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/Info.kt similarity index 87% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/Info.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/Info.kt index d6ed88f..5657c0d 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/Info.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/Info.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.model.info +package com.asyncapi.kotlinasyncapi.model.info -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent @AsyncApiComponent class Info { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/License.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/License.kt similarity index 68% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/License.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/License.kt index 44cd440..971d3fc 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/info/License.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/info/License.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.model.info +package com.asyncapi.kotlinasyncapi.model.info -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent @AsyncApiComponent class License { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/Server.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/Server.kt similarity index 92% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/Server.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/Server.kt index ae97c01..86b8f44 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/Server.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/Server.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.model.server +package com.asyncapi.kotlinasyncapi.model.server -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference import java.util.AbstractMap @AsyncApiComponent diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerBinding.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerBinding.kt similarity index 97% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerBinding.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerBinding.kt index 9987adb..c4e3cfb 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerBinding.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerBinding.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.model.server +package com.asyncapi.kotlinasyncapi.model.server -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference @AsyncApiComponent class ReferencableServerBindingsMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerVariable.kt b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerVariable.kt similarity index 84% rename from kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerVariable.kt rename to kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerVariable.kt index 9902f0a..88a265a 100644 --- a/kotlin-asyncapi-core/src/main/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerVariable.kt +++ b/kotlin-asyncapi-core/src/main/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerVariable.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.model.server +package com.asyncapi.kotlinasyncapi.model.server -import org.openfolder.kotlinasyncapi.model.AsyncApiComponent -import org.openfolder.kotlinasyncapi.model.Reference +import com.asyncapi.kotlinasyncapi.model.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.model.Reference @AsyncApiComponent class ReferencableServerVariablesMap : LinkedHashMap() { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApiIntegrationTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApiIntegrationTest.kt similarity index 94% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApiIntegrationTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApiIntegrationTest.kt index 9b23679..5c88333 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApiIntegrationTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApiIntegrationTest.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.AsyncApi.Companion.asyncApi -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.AsyncApi.Companion.asyncApi +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class AsyncApiIntegrationTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApiTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApiTest.kt similarity index 92% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApiTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApiTest.kt index 1308412..6081e0c 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/AsyncApiTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/AsyncApiTest.kt @@ -1,11 +1,11 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.info.Info +import com.asyncapi.kotlinasyncapi.model.info.Info internal class AsyncApiTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/CorrelationIDTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/CorrelationIDTest.kt similarity index 71% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/CorrelationIDTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/CorrelationIDTest.kt index 6005563..280f15f 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/CorrelationIDTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/CorrelationIDTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class CorrelationIDTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/ExternalDocumentationTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/ExternalDocumentationTest.kt similarity index 71% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/ExternalDocumentationTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/ExternalDocumentationTest.kt index 3622052..e2b464e 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/ExternalDocumentationTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/ExternalDocumentationTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ExternalDocumentationTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/ReferenceTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/ReferenceTest.kt similarity index 66% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/ReferenceTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/ReferenceTest.kt index 6cb9f1b..7367578 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/ReferenceTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/ReferenceTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ReferenceTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/SchemaTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/SchemaTest.kt similarity index 92% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/SchemaTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/SchemaTest.kt index 5b84b04..b71ec7d 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/SchemaTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/SchemaTest.kt @@ -1,12 +1,12 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class SchemaTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/TagTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/TagTest.kt similarity index 81% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/TagTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/TagTest.kt index 5ff22c9..f4a0b7f 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/TagTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/TagTest.kt @@ -1,12 +1,12 @@ -package org.openfolder.kotlinasyncapi.model +package com.asyncapi.kotlinasyncapi.model import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class TagTest { diff --git a/kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor/TestUtils.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/TestUtils.kt similarity index 94% rename from kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor/TestUtils.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/TestUtils.kt index 8f4f9bc..1a12f6a 100644 --- a/kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor/TestUtils.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/TestUtils.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.ktor +package com.asyncapi.kotlinasyncapi.model import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelBindingTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelBindingTest.kt similarity index 83% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelBindingTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelBindingTest.kt index 55dd050..24b5a07 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelBindingTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelBindingTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ChannelBindingTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelTest.kt similarity index 74% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelTest.kt index cd2789f..39acb1e 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ChannelTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ChannelTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ChannelTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageBindingTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageBindingTest.kt similarity index 71% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageBindingTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageBindingTest.kt index a1fc1a4..65c580c 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageBindingTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageBindingTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class MessageBindingTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageExampleTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageExampleTest.kt similarity index 74% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageExampleTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageExampleTest.kt index be5502b..c50bd5d 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageExampleTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageExampleTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class MessageExampleTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTest.kt similarity index 81% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTest.kt index 03a05c3..78e94a7 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTest.kt @@ -1,14 +1,14 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.CorrelationID -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.CorrelationID +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class MessageTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTraitTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTraitTest.kt similarity index 80% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTraitTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTraitTest.kt index 7b828f8..f05034a 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/MessageTraitTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/MessageTraitTest.kt @@ -1,14 +1,14 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.CorrelationID -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.CorrelationID +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class MessageTraitTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationBindingTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationBindingTest.kt similarity index 73% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationBindingTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationBindingTest.kt index 596a91e..b8efcc9 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationBindingTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationBindingTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class OperationBindingTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTest.kt similarity index 80% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTest.kt index e7fa8de..734e69c 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTest.kt @@ -1,13 +1,13 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class OperationTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTraitTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTraitTest.kt similarity index 79% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTraitTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTraitTest.kt index 4cd8d5a..c7e7b64 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/OperationTraitTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/OperationTraitTest.kt @@ -1,13 +1,13 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.ExternalDocumentation -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class OperationTraitTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ParameterTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ParameterTest.kt similarity index 70% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ParameterTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ParameterTest.kt index 6bc53b6..0f328d8 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/channel/ParameterTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/channel/ParameterTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.channel +package com.asyncapi.kotlinasyncapi.model.channel import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ParameterTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/ComponentsTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/ComponentsTest.kt similarity index 80% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/ComponentsTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/ComponentsTest.kt index 7590456..7f26751 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/ComponentsTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/ComponentsTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.component +package com.asyncapi.kotlinasyncapi.model.component import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ComponentsTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/OAuthFlowsTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/OAuthFlowsTest.kt similarity index 87% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/OAuthFlowsTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/OAuthFlowsTest.kt index ea1fd48..110b288 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/OAuthFlowsTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/OAuthFlowsTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.component +package com.asyncapi.kotlinasyncapi.model.component import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class OAuthFlowsTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/SecuritySchemaTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/SecuritySchemaTest.kt similarity index 78% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/SecuritySchemaTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/SecuritySchemaTest.kt index b4082e9..7bd09e5 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/component/SecuritySchemaTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/component/SecuritySchemaTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.component +package com.asyncapi.kotlinasyncapi.model.component import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class SecuritySchemaTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/ContactTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/ContactTest.kt similarity index 69% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/ContactTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/ContactTest.kt index f6a136b..0439643 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/ContactTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/ContactTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.info +package com.asyncapi.kotlinasyncapi.model.info import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ContactTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/InfoTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/InfoTest.kt similarity index 82% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/InfoTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/InfoTest.kt index 7bf44f7..0f1650b 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/InfoTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/InfoTest.kt @@ -1,12 +1,12 @@ -package org.openfolder.kotlinasyncapi.model.info +package com.asyncapi.kotlinasyncapi.model.info import io.mockk.clearConstructorMockk import io.mockk.every import io.mockk.mockkConstructor import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class InfoTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/LicenseTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/LicenseTest.kt similarity index 67% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/LicenseTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/LicenseTest.kt index b677043..42f551a 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/info/LicenseTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/info/LicenseTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.info +package com.asyncapi.kotlinasyncapi.model.info import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class LicenseTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerBindingTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerBindingTest.kt similarity index 80% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerBindingTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerBindingTest.kt index 56bd6a8..7e89c4a 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerBindingTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerBindingTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.server +package com.asyncapi.kotlinasyncapi.model.server import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ServerBindingTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerTest.kt similarity index 77% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerTest.kt index ffe60b1..ace6b2a 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.server +package com.asyncapi.kotlinasyncapi.model.server import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ServerTest { diff --git a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerVariableTest.kt b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerVariableTest.kt similarity index 73% rename from kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerVariableTest.kt rename to kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerVariableTest.kt index bd51883..ada3b39 100644 --- a/kotlin-asyncapi-core/src/test/kotlin/org/openfolder/kotlinasyncapi/model/server/ServerVariableTest.kt +++ b/kotlin-asyncapi-core/src/test/kotlin/com/asyncapi/kotlinasyncapi/model/server/ServerVariableTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.model.server +package com.asyncapi.kotlinasyncapi.model.server import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.model.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.model.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.model.TestUtils.json internal class ServerVariableTest { diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/resources/build.asyncapi.kts b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/build.asyncapi.kts similarity index 100% rename from kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/resources/build.asyncapi.kts rename to kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/build.asyncapi.kts diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/pom.xml b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/pom.xml index e3036db..9262b06 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/pom.xml +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/pom.xml @@ -6,7 +6,7 @@ kotlin-asyncapi-examples - org.openfolder + com.asyncapi 3.0.4-SNAPSHOT @@ -22,11 +22,11 @@ 2.3.12 1.4.14 2.0.9 - org.openfolder.kotlinasyncapi.example.ktor.ExampleApplicationKt + com.asyncapi.kotlinasyncapi.example.ktor.ExampleApplicationKt - org.openfolder + com.asyncapi kotlin-asyncapi-ktor @@ -137,7 +137,7 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-maven-plugin ${version} diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt similarity index 69% rename from kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt index 78ab092..32eb5d4 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/AsyncApiConfiguration.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.example.ktor +package com.asyncapi.kotlinasyncapi.example.ktor -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension val asyncApiExtension = AsyncApiExtension.builder { defaultContentType("application/json") diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ChatMessage.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ChatMessage.kt new file mode 100644 index 0000000..58248eb --- /dev/null +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ChatMessage.kt @@ -0,0 +1,9 @@ +package com.asyncapi.kotlinasyncapi.example.ktor + +import com.asyncapi.kotlinasyncapi.annotation.channel.Message + +@Message +data class ChatMessage( + val id: String, + val text: String +) diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ExampleApplication.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ExampleApplication.kt similarity index 72% rename from kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ExampleApplication.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ExampleApplication.kt index a4fb473..999f345 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ExampleApplication.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/ExampleApplication.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.example.ktor +package com.asyncapi.kotlinasyncapi.example.ktor import io.ktor.server.application.install import io.ktor.server.engine.embeddedServer import io.ktor.server.netty.Netty -import org.openfolder.kotlinasyncapi.ktor.AsyncApiPlugin +import com.asyncapi.kotlinasyncapi.ktor.AsyncApiPlugin fun main() { embeddedServer(Netty, port = 8000) { diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/RoomChannel.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/RoomChannel.kt similarity index 66% rename from kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/RoomChannel.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/RoomChannel.kt index 4ce5cad..4f12dba 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/RoomChannel.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/ktor/RoomChannel.kt @@ -1,10 +1,10 @@ -package org.openfolder.kotlinasyncapi.example.ktor +package com.asyncapi.kotlinasyncapi.example.ktor -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe @Channel( value = "/rooms/{roomId}", diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ChatMessage.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ChatMessage.kt deleted file mode 100644 index c6f0438..0000000 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-ktor-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/ktor/ChatMessage.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.openfolder.kotlinasyncapi.example.ktor - -import org.openfolder.kotlinasyncapi.annotation.channel.Message - -@Message -data class ChatMessage( - val id: String, - val text: String -) diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/resources/build.asyncapi.kts b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/build.asyncapi.kts similarity index 100% rename from kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/resources/build.asyncapi.kts rename to kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/build.asyncapi.kts diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml index 8ac78da..6398057 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/pom.xml @@ -5,7 +5,7 @@ kotlin-asyncapi-examples - org.openfolder + com.asyncapi 3.0.4-SNAPSHOT @@ -19,7 +19,7 @@ 17 1.9.10 3.2.0 - org.openfolder.kotlinasyncapi.example.spring.ExampleApplicationKt + com.asyncapi.kotlinasyncapi.example.spring.ExampleApplicationKt @@ -36,7 +36,7 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-spring-web @@ -104,7 +104,7 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-maven-plugin ${version} diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt similarity index 79% rename from kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt index 6441d04..ece6d4b 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/AsyncApiConfiguration.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.example.spring +package com.asyncapi.kotlinasyncapi.example.spring -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ChatMessage.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ChatMessage.kt new file mode 100644 index 0000000..34ddbc8 --- /dev/null +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ChatMessage.kt @@ -0,0 +1,9 @@ +package com.asyncapi.kotlinasyncapi.example.spring + +import com.asyncapi.kotlinasyncapi.annotation.channel.Message + +@Message +data class ChatMessage( + val id: String, + val text: String +) diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ExampleApplication.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ExampleApplication.kt similarity index 69% rename from kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ExampleApplication.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ExampleApplication.kt index e249a5a..4ac9a94 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ExampleApplication.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ExampleApplication.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.example.spring +package com.asyncapi.kotlinasyncapi.example.spring -import org.openfolder.kotlinasyncapi.springweb.EnableAsyncApi +import com.asyncapi.kotlinasyncapi.springweb.EnableAsyncApi import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/RoomChannel.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/RoomChannel.kt similarity index 67% rename from kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/RoomChannel.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/RoomChannel.kt index 350b1a4..362b733 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/RoomChannel.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/com/asyncapi/kotlinasyncapi/example/spring/RoomChannel.kt @@ -1,10 +1,10 @@ -package org.openfolder.kotlinasyncapi.example.spring +package com.asyncapi.kotlinasyncapi.example.spring -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe import org.springframework.stereotype.Component @Component diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ChatMessage.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ChatMessage.kt deleted file mode 100644 index d7d9459..0000000 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/main/kotlin/org/openfolder/kotlinasyncapi/example/spring/ChatMessage.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.openfolder.kotlinasyncapi.example.spring - -import org.openfolder.kotlinasyncapi.annotation.channel.Message - -@Message -data class ChatMessage( - val id: String, - val text: String -) diff --git a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/org/openfolder/kotlinasyncapi/example/spring/ExampleApplicationTests.kt b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ExampleApplicationTests.kt similarity index 77% rename from kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/org/openfolder/kotlinasyncapi/example/spring/ExampleApplicationTests.kt rename to kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ExampleApplicationTests.kt index 2c269a6..b0c1294 100644 --- a/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/org/openfolder/kotlinasyncapi/example/spring/ExampleApplicationTests.kt +++ b/kotlin-asyncapi-examples/kotlin-asyncapi-spring-boot-example/src/test/kotlin/com/asyncapi/kotlinasyncapi/example/spring/ExampleApplicationTests.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.example.spring +package com.asyncapi.kotlinasyncapi.example.spring import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest diff --git a/kotlin-asyncapi-examples/pom.xml b/kotlin-asyncapi-examples/pom.xml index 7b0bfe3..bf9c449 100644 --- a/kotlin-asyncapi-examples/pom.xml +++ b/kotlin-asyncapi-examples/pom.xml @@ -5,7 +5,7 @@ kotlin-asyncapi-parent - org.openfolder + com.asyncapi 3.0.4-SNAPSHOT diff --git a/kotlin-asyncapi-ktor/pom.xml b/kotlin-asyncapi-ktor/pom.xml index b9a710a..9872b50 100644 --- a/kotlin-asyncapi-ktor/pom.xml +++ b/kotlin-asyncapi-ktor/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openfolder + com.asyncapi kotlin-asyncapi-parent 3.0.4-SNAPSHOT @@ -16,7 +16,7 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-context diff --git a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiConfiguration.kt b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiConfiguration.kt similarity index 78% rename from kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiConfiguration.kt rename to kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiConfiguration.kt index 8627d0b..52591c6 100644 --- a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiConfiguration.kt +++ b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiConfiguration.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.ktor +package com.asyncapi.kotlinasyncapi.ktor -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension import kotlin.reflect.KClass class AsyncApiConfiguration { diff --git a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt similarity index 78% rename from kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt rename to kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt index 854728d..56d7680 100644 --- a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiModule.kt +++ b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.ktor +package com.asyncapi.kotlinasyncapi.ktor import io.ktor.http.ContentType import io.ktor.http.HttpStatusCode @@ -10,18 +10,18 @@ import io.ktor.server.routing.get import io.ktor.server.routing.route import io.ktor.server.routing.routing import kotlin.script.experimental.host.toScriptSource -import org.openfolder.kotlinasyncapi.context.PackageInfoProvider -import org.openfolder.kotlinasyncapi.context.ResourceProvider -import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider -import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner -import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension -import org.openfolder.kotlinasyncapi.context.service.AsyncApiSerializer -import org.openfolder.kotlinasyncapi.context.service.AsyncApiService -import org.openfolder.kotlinasyncapi.context.service.DefaultAsyncApiSerializer -import org.openfolder.kotlinasyncapi.context.service.DefaultAsyncApiService +import com.asyncapi.kotlinasyncapi.context.PackageInfoProvider +import com.asyncapi.kotlinasyncapi.context.ResourceProvider +import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationProvider +import com.asyncapi.kotlinasyncapi.context.annotation.DefaultAnnotationScanner +import com.asyncapi.kotlinasyncapi.context.annotation.processor.ChannelProcessor +import com.asyncapi.kotlinasyncapi.context.annotation.processor.MessageProcessor +import com.asyncapi.kotlinasyncapi.context.annotation.processor.SchemaProcessor +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiSerializer +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiService +import com.asyncapi.kotlinasyncapi.context.service.DefaultAsyncApiSerializer +import com.asyncapi.kotlinasyncapi.context.service.DefaultAsyncApiService class AsyncApiModule( environment: ApplicationEnvironment, diff --git a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiPlugin.kt b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiPlugin.kt similarity index 88% rename from kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiPlugin.kt rename to kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiPlugin.kt index 3f5db48..617370d 100644 --- a/kotlin-asyncapi-ktor/src/main/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiPlugin.kt +++ b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiPlugin.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.ktor +package com.asyncapi.kotlinasyncapi.ktor import io.ktor.server.application.createApplicationPlugin diff --git a/kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt b/kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt similarity index 84% rename from kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt rename to kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt index 1607589..3b6f032 100644 --- a/kotlin-asyncapi-ktor/src/test/kotlin/org/openfolder/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt +++ b/kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiPluginIntegrationTest.kt @@ -1,25 +1,25 @@ -package org.openfolder.kotlinasyncapi.ktor +package com.asyncapi.kotlinasyncapi.ktor import io.ktor.client.request.get import io.ktor.client.statement.bodyAsText import io.ktor.server.application.install import io.ktor.server.testing.testApplication import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.Tag -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.ChannelBinding -import org.openfolder.kotlinasyncapi.annotation.channel.ChannelBindings -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.MessageBinding -import org.openfolder.kotlinasyncapi.annotation.channel.MessageBindings -import org.openfolder.kotlinasyncapi.annotation.channel.MessageExample -import org.openfolder.kotlinasyncapi.annotation.channel.OperationBinding -import org.openfolder.kotlinasyncapi.annotation.channel.OperationBindings -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.ChannelBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.ChannelBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageExample +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension class AsyncApiPluginIntegrationTest { diff --git a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/TestUtils.kt b/kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor/TestUtils.kt similarity index 94% rename from kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/TestUtils.kt rename to kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor/TestUtils.kt index 135c231..b08e110 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/org/openfolder/kotlinasyncapi/context/TestUtils.kt +++ b/kotlin-asyncapi-ktor/src/test/kotlin/com/asyncapi/kotlinasyncapi/ktor/TestUtils.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.context +package com.asyncapi.kotlinasyncapi.ktor import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper diff --git a/kotlin-asyncapi-maven-plugin/pom.xml b/kotlin-asyncapi-maven-plugin/pom.xml index 9b1b82b..0bbdb22 100644 --- a/kotlin-asyncapi-maven-plugin/pom.xml +++ b/kotlin-asyncapi-maven-plugin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 kotlin-asyncapi-parent - org.openfolder + com.asyncapi 3.0.4-SNAPSHOT @@ -15,11 +15,11 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-core - org.openfolder + com.asyncapi kotlin-asyncapi-script diff --git a/kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt b/kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt similarity index 85% rename from kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt rename to kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt index 4025c00..0baa0f4 100644 --- a/kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt +++ b/kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiFileWriter.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.mavenplugin +package com.asyncapi.kotlinasyncapi.mavenplugin import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi import java.io.File import javax.inject.Named import javax.inject.Singleton diff --git a/kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt b/kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt similarity index 95% rename from kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt rename to kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt index 6180d2d..b856ad7 100644 --- a/kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt +++ b/kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiPlugin.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.mavenplugin +package com.asyncapi.kotlinasyncapi.mavenplugin import org.apache.maven.model.Resource import org.apache.maven.plugin.AbstractMojo @@ -6,7 +6,7 @@ import org.apache.maven.plugins.annotations.LifecyclePhase import org.apache.maven.plugins.annotations.Mojo import org.apache.maven.plugins.annotations.Parameter import org.apache.maven.project.MavenProject -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi import java.io.File import javax.inject.Inject diff --git a/kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt b/kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt similarity index 83% rename from kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt rename to kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt index f7c21c5..6a37c26 100644 --- a/kotlin-asyncapi-maven-plugin/src/main/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt +++ b/kotlin-asyncapi-maven-plugin/src/main/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiScriptRunner.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.mavenplugin +package com.asyncapi.kotlinasyncapi.mavenplugin -import org.openfolder.kotlinasyncapi.model.AsyncApi -import org.openfolder.kotlinasyncapi.script.AsyncApiScript +import com.asyncapi.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.script.AsyncApiScript import java.io.File import javax.inject.Named import javax.inject.Singleton diff --git a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt similarity index 76% rename from kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt rename to kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt index d992a67..6455af5 100644 --- a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt +++ b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiJsonWriterTest.kt @@ -1,9 +1,9 @@ -package org.openfolder.kotlinasyncapi.mavenplugin +package com.asyncapi.kotlinasyncapi.mavenplugin import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.mavenplugin.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.mavenplugin.TestUtils.json -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.mavenplugin.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.mavenplugin.TestUtils.json +import com.asyncapi.kotlinasyncapi.model.AsyncApi import java.io.File import kotlin.test.AfterTest diff --git a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt similarity index 94% rename from kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt rename to kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt index 628f628..a238f98 100644 --- a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt +++ b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiPluginTest.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.mavenplugin +package com.asyncapi.kotlinasyncapi.mavenplugin import io.mockk.every import io.mockk.impl.annotations.InjectMockKs @@ -10,7 +10,7 @@ import io.mockk.verify import org.apache.maven.project.MavenProject import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi import java.io.File @ExtendWith(MockKExtension::class) diff --git a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt similarity index 69% rename from kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt rename to kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt index 86a676c..e98b256 100644 --- a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt +++ b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/AsyncApiScriptHostTest.kt @@ -1,8 +1,8 @@ -package org.openfolder.kotlinasyncapi.mavenplugin +package com.asyncapi.kotlinasyncapi.mavenplugin import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.mavenplugin.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.mavenplugin.TestUtils.json +import com.asyncapi.kotlinasyncapi.mavenplugin.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.mavenplugin.TestUtils.json import java.io.File internal class AsyncApiScriptHostTest { diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/TestUtils.kt b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/TestUtils.kt similarity index 94% rename from kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/TestUtils.kt rename to kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/TestUtils.kt index 536cdd3..3561827 100644 --- a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/TestUtils.kt +++ b/kotlin-asyncapi-maven-plugin/src/test/kotlin/com/asyncapi/kotlinasyncapi/mavenplugin/TestUtils.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.springweb +package com.asyncapi.kotlinasyncapi.mavenplugin import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper diff --git a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/TestUtils.kt b/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/TestUtils.kt deleted file mode 100644 index c4de4df..0000000 --- a/kotlin-asyncapi-maven-plugin/src/test/kotlin/org/openfolder/kotlinasyncapi/mavenplugin/TestUtils.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.openfolder.kotlinasyncapi.mavenplugin - -import com.fasterxml.jackson.annotation.JsonInclude -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.databind.SerializationFeature -import org.skyscreamer.jsonassert.JSONAssert -import org.skyscreamer.jsonassert.JSONCompareMode - -object TestUtils { - val objectMapper = ObjectMapper() - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - - fun json(path: String): String = TestUtils::class.java.classLoader.getResource(path)?.readText()!! - - fun json(value: Any): String = objectMapper.writeValueAsString(value) - - fun assertJsonEquals(expected: String, actual: String) = - JSONAssert.assertEquals(expected, actual, JSONCompareMode.NON_EXTENSIBLE) -} diff --git a/kotlin-asyncapi-script/pom.xml b/kotlin-asyncapi-script/pom.xml index a8bdcfd..110e5d1 100644 --- a/kotlin-asyncapi-script/pom.xml +++ b/kotlin-asyncapi-script/pom.xml @@ -3,7 +3,7 @@ 4.0.0 kotlin-asyncapi-parent - org.openfolder + com.asyncapi 3.0.4-SNAPSHOT @@ -15,7 +15,7 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-core diff --git a/kotlin-asyncapi-script/src/main/kotlin/org/openfolder/kotlinasyncapi/script/AsyncApiScript.kt b/kotlin-asyncapi-script/src/main/kotlin/com/asyncapi/kotlinasyncapi/script/AsyncApiScript.kt similarity index 89% rename from kotlin-asyncapi-script/src/main/kotlin/org/openfolder/kotlinasyncapi/script/AsyncApiScript.kt rename to kotlin-asyncapi-script/src/main/kotlin/com/asyncapi/kotlinasyncapi/script/AsyncApiScript.kt index 6f8be89..9cb5278 100644 --- a/kotlin-asyncapi-script/src/main/kotlin/org/openfolder/kotlinasyncapi/script/AsyncApiScript.kt +++ b/kotlin-asyncapi-script/src/main/kotlin/com/asyncapi/kotlinasyncapi/script/AsyncApiScript.kt @@ -1,6 +1,6 @@ -package org.openfolder.kotlinasyncapi.script +package com.asyncapi.kotlinasyncapi.script -import org.openfolder.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.model.AsyncApi import kotlin.script.experimental.annotations.KotlinScript import kotlin.script.experimental.api.ScriptAcceptedLocation import kotlin.script.experimental.api.ScriptCompilationConfiguration @@ -20,7 +20,7 @@ import kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContext abstract class AsyncApiScript internal object AsyncApiScriptCompilationConfiguration : ScriptCompilationConfiguration({ - defaultImports("org.openfolder.kotlinasyncapi.model.*") + defaultImports("com.asyncapi.kotlinasyncapi.model.*") implicitReceivers(AsyncApi::class) ide { acceptedLocations(ScriptAcceptedLocation.Everywhere) diff --git a/kotlin-asyncapi-spring-web/pom.xml b/kotlin-asyncapi-spring-web/pom.xml index 0926cc3..1d8791d 100644 --- a/kotlin-asyncapi-spring-web/pom.xml +++ b/kotlin-asyncapi-spring-web/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openfolder + com.asyncapi kotlin-asyncapi-parent 3.0.4-SNAPSHOT @@ -16,7 +16,7 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-context @@ -52,7 +52,7 @@ org.springframework.boot spring-boot-starter-test - 3.2.0 + 3.4.0 test @@ -64,7 +64,7 @@ org.springframework.boot spring-boot-starter-web - 3.2.0 + 3.4.0 test diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt similarity index 78% rename from kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt rename to kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index eaf07a0..2b31f90 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -1,26 +1,26 @@ -package org.openfolder.kotlinasyncapi.springweb +package com.asyncapi.kotlinasyncapi.springweb import kotlin.reflect.KClass import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.context.AsyncApiContextProvider -import org.openfolder.kotlinasyncapi.context.PackageInfoProvider -import org.openfolder.kotlinasyncapi.context.ResourceProvider -import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider -import org.openfolder.kotlinasyncapi.context.annotation.AnnotationScanner -import org.openfolder.kotlinasyncapi.context.annotation.DefaultAnnotationScanner -import org.openfolder.kotlinasyncapi.context.annotation.processor.AnnotationProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.ChannelProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.MessageProcessor -import org.openfolder.kotlinasyncapi.context.annotation.processor.SchemaProcessor -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension -import org.openfolder.kotlinasyncapi.context.service.AsyncApiSerializer -import org.openfolder.kotlinasyncapi.context.service.AsyncApiService -import org.openfolder.kotlinasyncapi.context.service.DefaultAsyncApiSerializer -import org.openfolder.kotlinasyncapi.context.service.DefaultAsyncApiService +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.context.AsyncApiContextProvider +import com.asyncapi.kotlinasyncapi.context.PackageInfoProvider +import com.asyncapi.kotlinasyncapi.context.ResourceProvider +import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationProvider +import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationScanner +import com.asyncapi.kotlinasyncapi.context.annotation.DefaultAnnotationScanner +import com.asyncapi.kotlinasyncapi.context.annotation.processor.AnnotationProcessor +import com.asyncapi.kotlinasyncapi.context.annotation.processor.ChannelProcessor +import com.asyncapi.kotlinasyncapi.context.annotation.processor.MessageProcessor +import com.asyncapi.kotlinasyncapi.context.annotation.processor.SchemaProcessor +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiSerializer +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiService +import com.asyncapi.kotlinasyncapi.context.service.DefaultAsyncApiSerializer +import com.asyncapi.kotlinasyncapi.context.service.DefaultAsyncApiService import org.springframework.boot.autoconfigure.AutoConfiguration import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnClass diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiController.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiController.kt similarity index 75% rename from kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiController.kt rename to kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiController.kt index 489b7ff..587767a 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiController.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiController.kt @@ -1,7 +1,7 @@ -package org.openfolder.kotlinasyncapi.springweb +package com.asyncapi.kotlinasyncapi.springweb -import org.openfolder.kotlinasyncapi.context.service.AsyncApiSerializer -import org.openfolder.kotlinasyncapi.context.service.AsyncApiService +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiSerializer +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiService import org.springframework.http.MediaType import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiProperties.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiProperties.kt similarity index 90% rename from kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiProperties.kt rename to kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiProperties.kt index 46f3376..7b9cd72 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiProperties.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiProperties.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.springweb +package com.asyncapi.kotlinasyncapi.springweb import org.springframework.stereotype.Component diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/EnableAsyncApi.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/EnableAsyncApi.kt similarity index 79% rename from kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/EnableAsyncApi.kt rename to kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/EnableAsyncApi.kt index d65b296..61d976e 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/EnableAsyncApi.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/EnableAsyncApi.kt @@ -1,4 +1,4 @@ -package org.openfolder.kotlinasyncapi.springweb +package com.asyncapi.kotlinasyncapi.springweb import org.springframework.context.annotation.Import diff --git a/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index cfd19cf..0c5fd03 100644 --- a/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/kotlin-asyncapi-spring-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -org.openfolder.kotlinasyncapi.springweb.AsyncApiAutoConfiguration \ No newline at end of file +com.asyncapi.kotlinasyncapi.springweb.AsyncApiAutoConfiguration \ No newline at end of file diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/TestUtils.kt b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/TestUtils.kt new file mode 100644 index 0000000..815a56d --- /dev/null +++ b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/TestUtils.kt @@ -0,0 +1,20 @@ +package com.asyncapi.kotlinasyncapi.springweb + +import com.fasterxml.jackson.annotation.JsonInclude +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.SerializationFeature +import org.skyscreamer.jsonassert.JSONAssert +import org.skyscreamer.jsonassert.JSONCompareMode + +object TestUtils { + val objectMapper = ObjectMapper() + .setSerializationInclusion(JsonInclude.Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT) + + fun json(path: String): String = TestUtils::class.java.classLoader.getResource(path)?.readText()!! + + fun json(value: Any): String = objectMapper.writeValueAsString(value) + + fun assertJsonEquals(expected: String, actual: String) = + JSONAssert.assertEquals(expected, actual, JSONCompareMode.NON_EXTENSIBLE) +} diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt similarity index 63% rename from kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt rename to kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt index e26fb1e..3fdab8c 100644 --- a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt +++ b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/annotation/AnnotationProviderIntegrationTest.kt @@ -1,23 +1,23 @@ -package org.openfolder.kotlinasyncapi.springweb.annotation +package com.asyncapi.kotlinasyncapi.springweb.annotation import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.ExternalDocumentation -import org.openfolder.kotlinasyncapi.annotation.Schema -import org.openfolder.kotlinasyncapi.annotation.Tag -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.ChannelBinding -import org.openfolder.kotlinasyncapi.annotation.channel.ChannelBindings -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.MessageBinding -import org.openfolder.kotlinasyncapi.annotation.channel.MessageBindings -import org.openfolder.kotlinasyncapi.annotation.channel.MessageExample -import org.openfolder.kotlinasyncapi.annotation.channel.OperationBinding -import org.openfolder.kotlinasyncapi.annotation.channel.OperationBindings -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.context.annotation.AnnotationProvider -import org.openfolder.kotlinasyncapi.springweb.EnableAsyncApi -import org.openfolder.kotlinasyncapi.springweb.TestUtils +import com.asyncapi.kotlinasyncapi.annotation.ExternalDocumentation +import com.asyncapi.kotlinasyncapi.annotation.Schema +import com.asyncapi.kotlinasyncapi.annotation.Tag +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.ChannelBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.ChannelBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.MessageExample +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationBinding +import com.asyncapi.kotlinasyncapi.annotation.channel.OperationBindings +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationProvider +import com.asyncapi.kotlinasyncapi.springweb.EnableAsyncApi +import com.asyncapi.kotlinasyncapi.springweb.TestUtils import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.SpringBootConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt similarity index 94% rename from kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt rename to kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt index 8bcb2d3..467946c 100644 --- a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt +++ b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt @@ -1,12 +1,12 @@ -package org.openfolder.kotlinasyncapi.springweb.controller +package com.asyncapi.kotlinasyncapi.springweb.controller import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.Publish -import org.openfolder.kotlinasyncapi.context.service.AsyncApiExtension -import org.openfolder.kotlinasyncapi.springweb.EnableAsyncApi -import org.openfolder.kotlinasyncapi.springweb.TestUtils +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.Publish +import com.asyncapi.kotlinasyncapi.context.service.AsyncApiExtension +import com.asyncapi.kotlinasyncapi.springweb.EnableAsyncApi +import com.asyncapi.kotlinasyncapi.springweb.TestUtils import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.SpringBootConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt similarity index 82% rename from kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt rename to kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt index 6d56eae..670a70c 100644 --- a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt +++ b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/resource/ResourceProviderIntegrationTest.kt @@ -1,10 +1,10 @@ -package org.openfolder.kotlinasyncapi.springweb.resource +package com.asyncapi.kotlinasyncapi.springweb.resource import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.context.ResourceProvider -import org.openfolder.kotlinasyncapi.model.AsyncApi -import org.openfolder.kotlinasyncapi.springweb.EnableAsyncApi +import com.asyncapi.kotlinasyncapi.context.ResourceProvider +import com.asyncapi.kotlinasyncapi.model.AsyncApi +import com.asyncapi.kotlinasyncapi.springweb.EnableAsyncApi import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.SpringBootConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration diff --git a/pom.xml b/pom.xml index 547dfe1..7dfb8bc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,18 +2,18 @@ 4.0.0 - org.openfolder + com.asyncapi kotlin-asyncapi-parent 3.0.4-SNAPSHOT pom Kotlin AsyncAPI Parent POM Parent POM for the Kotlin AsyncAPI framework - https://github.com/openfolder/kotlin-asyncapi + https://github.com/asyncapi/kotlin-asyncapi - OpenFolder - http://openfolder.org + AsyncAPI Initiative + https://www.asyncapi.com/ @@ -24,17 +24,17 @@ - scm:git:git://github.com/openfolder/kotlin-asyncapi.git - scm:git:ssh://git@github.com:openfolder/kotlin-asyncapi.git - https://github.com/openfolder/kotlin-asyncapi + scm:git:git://github.com/asyncapi/kotlin-asyncapi.git + scm:git:ssh://git@github.com:asyncapi/kotlin-asyncapi.git + https://github.com/asyncapi/kotlin-asyncapi Lorenz Simon - lorenz.simon@openfolder.org - OpenFolder - http://openfolder.org + lorenz.simon.mail@gmail.com + AsyncAPI Initiative + http://www.asyncapi.com @@ -56,10 +56,10 @@ 2.15.3 2.2.19 4.8.163 - 1.12.3 - 1.5.1 - 5.10.1 - 3.24.2 + 1.13.13 + 1.5.3 + 5.11.3 + 3.26.3 @@ -223,7 +223,7 @@ io.mockk - mockk + mockk-jvm ${mockk.version} test @@ -232,32 +232,32 @@ - org.openfolder + com.asyncapi kotlin-asyncapi-spring-web ${project.version} - org.openfolder + com.asyncapi kotlin-asyncapi-ktor ${project.version} - org.openfolder + com.asyncapi kotlin-asyncapi-core ${project.version} - org.openfolder + com.asyncapi kotlin-asyncapi-script ${project.version} - org.openfolder + com.asyncapi kotlin-asyncapi-annotation ${project.version} - org.openfolder + com.asyncapi kotlin-asyncapi-context ${project.version} From 2a168e5cf506c5f19998656acedf41b812ec1f50 Mon Sep 17 00:00:00 2001 From: lorenzsimon Date: Sun, 15 Dec 2024 15:33:31 +0100 Subject: [PATCH 09/15] chore: Update repositories --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7dfb8bc..90178c5 100644 --- a/pom.xml +++ b/pom.xml @@ -200,12 +200,12 @@ ossrh Sonatype Nexus Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots + https://oss.sonatype.org/content/repositories/snapshots ossrh Nexus Release Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + https://oss.sonatype.org/service/local/staging/deploy/maven2/ From 7a428bd65cfd0a7b74d3fd095656dbab79baae35 Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Tue, 17 Dec 2024 11:08:53 -0500 Subject: [PATCH 10/15] change how the map is populated for channels found via AsyncApiComponent and for Channel annotations to handle the fact that not all of them will be named based on their class and that will only happen if they target a class instead of a function. --- .../annotation/AsyncApiComponent.kt | 4 +- .../context/annotation/AnnotationProvider.kt | 16 ++++-- .../processor/AsyncApiComponentProcessor.kt | 5 +- .../annotation/async_api_component.json | 2 +- .../AsyncApiControllerIntegrationTest.kt | 50 ++++++++++++++++ ..._api_component_annotation_integration.json | 57 +++++++++++++++++++ 6 files changed, 122 insertions(+), 12 deletions(-) create mode 100644 kotlin-asyncapi-spring-web/src/test/resources/async_api_component_annotation_integration.json diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt index 6f7e17f..a04b8a6 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/org/openfolder/kotlinasyncapi/annotation/AsyncApiComponent.kt @@ -2,6 +2,4 @@ package org.openfolder.kotlinasyncapi.annotation @Target(AnnotationTarget.CLASS) @AsyncApiAnnotation -annotation class AsyncApiComponent( - val value: String = "", -) \ No newline at end of file +annotation class AsyncApiComponent \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt index 2b6dcc2..cdcd438 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -72,7 +72,8 @@ class AnnotationProvider( listOfNotNull( clazz.findAnnotation()?.let { clazz to it }, clazz.findAnnotation()?.let { clazz to it }, - clazz.findAnnotation()?.let { clazz to it } + clazz.findAnnotation()?.let { clazz to it }, + clazz.findAnnotation()?.let { clazz to it} ) } .mapNotNull { (clazz, annotation) -> @@ -80,12 +81,15 @@ class AnnotationProvider( is Message -> messageProcessor.process(annotation, clazz) is Schema -> schemaProcessor.process(annotation, clazz) is Channel -> channelProcessor.process(annotation, clazz).also { - componentToChannelMapping[clazz.java.simpleName] = - annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName + if (clazz.annotations.any { it is Channel }) { + componentToChannelMapping[clazz.java.simpleName] = + annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName + } } - is AsyncApiComponent -> asyncApiComponentProcessor.process(annotation, clazz).also { - componentToChannelMapping[clazz.java.simpleName] = - annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName + is AsyncApiComponent -> asyncApiComponentProcessor.process(annotation, clazz).also { processedComponents -> + processedComponents.channels?.forEach { (channelName, _) -> + componentToChannelMapping[channelName] = channelName + } } else -> null } diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt index 79f7b50..9aae918 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt @@ -15,13 +15,14 @@ class AsyncApiComponentProcessor : AnnotationProcessor() }.forEach { currentFunction -> - currentFunction.findAnnotation()!!.toChannel() + var currentAnnotation = currentFunction.findAnnotation()!! + currentAnnotation.toChannel() .apply { subscribe = subscribe ?: currentFunction.findAnnotation()?.toOperation() publish = publish ?: currentFunction.findAnnotation()?.toOperation() } .also { - put(currentFunction.name, it) + put(currentAnnotation.value, it) } } } diff --git a/kotlin-asyncapi-context/src/test/resources/annotation/async_api_component.json b/kotlin-asyncapi-context/src/test/resources/annotation/async_api_component.json index c1e86bc..a9edb0d 100644 --- a/kotlin-asyncapi-context/src/test/resources/annotation/async_api_component.json +++ b/kotlin-asyncapi-context/src/test/resources/annotation/async_api_component.json @@ -1,6 +1,6 @@ { "channels" : { - "testSubscribe" : { + "some/{parameter}/channel" : { "description" : "testDescription", "servers" : [ "dev" ], "subscribe" : { diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt b/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt index 8bcb2d3..1ea1c10 100644 --- a/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt +++ b/kotlin-asyncapi-spring-web/src/test/kotlin/org/openfolder/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt @@ -1,6 +1,7 @@ package org.openfolder.kotlinasyncapi.springweb.controller import org.junit.jupiter.api.Test +import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent import org.openfolder.kotlinasyncapi.annotation.channel.Channel import org.openfolder.kotlinasyncapi.annotation.channel.Message import org.openfolder.kotlinasyncapi.annotation.channel.Publish @@ -212,3 +213,52 @@ internal class AsyncApiControllerAnnotationIntegrationTest { val optionalValue: Boolean? ) } + +@SpringBootTest +@AutoConfigureMockMvc +internal class AsyncApiComponentAnnotationControllerIntegrationTest { + + @Autowired + lateinit var mockMvc: MockMvc + + @Test + fun `should return AsyncApi document`() { + val expected = TestUtils.json("async_api_component_annotation_integration.json") + + mockMvc.perform(get("/docs/asyncapi")) + .andExpect(MockMvcResultMatchers.status().is2xxSuccessful) + .andExpect(content().json(expected)) + } + + @SpringBootConfiguration + @EnableAutoConfiguration + @EnableAsyncApi + open class TestConfig { + + @Bean + open fun asyncApiExtension() = + AsyncApiExtension.builder { + info { + title("testTitle") + version("testVersion") + } + } + } + + @AsyncApiComponent + class TestChannel { + + @Channel("my/channel") + @Publish( + description = "testDescription", + message = Message(TestMessage::class) + ) + fun testOperation() {} + } + + @Message + data class TestMessage( + val value: String, + val optionalValue: Boolean? + ) +} \ No newline at end of file diff --git a/kotlin-asyncapi-spring-web/src/test/resources/async_api_component_annotation_integration.json b/kotlin-asyncapi-spring-web/src/test/resources/async_api_component_annotation_integration.json new file mode 100644 index 0000000..519b246 --- /dev/null +++ b/kotlin-asyncapi-spring-web/src/test/resources/async_api_component_annotation_integration.json @@ -0,0 +1,57 @@ +{ + "asyncapi": "2.4.0", + "info": { + "title": "testTitle", + "version": "testVersion" + }, + "channels": { + "my/channel": { + "$ref": "#/components/channels/TestChannel" + } + }, + "components": { + "schemas": { + "TestMessage": { + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "type": "string", + "exampleSetFlag": false, + "types": [ + "string" + ] + }, + "optionalValue": { + "type": "boolean", + "exampleSetFlag": false, + "types": [ + "boolean" + ] + } + }, + "exampleSetFlag": false + } + }, + "channels": { + "my/channel": { + "publish": { + "description": "testDescription", + "message": { + "$ref": "#/components/messages/TestMessage" + } + } + } + }, + "messages": { + "TestMessage": { + "payload": { + "$ref": "#/components/schemas/TestMessage" + }, + "schemaFormat": "application/schema+json;version=draft-07" + } + } + } +} From 6340f6bbf9e238f913f9a85043880eca362ee970 Mon Sep 17 00:00:00 2001 From: Lorenz Simon Date: Fri, 20 Dec 2024 22:16:56 +0100 Subject: [PATCH 11/15] Update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index e690364..911aead 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # Default owners -* @lorenzsimon @sueskind @gimlet2 +* @lorenzsimon @gimlet2 From fe761cd9c8a887918e4591cb5d18bb25c2f93709 Mon Sep 17 00:00:00 2001 From: Lorenz Simon Date: Sun, 22 Dec 2024 14:42:36 +0100 Subject: [PATCH 12/15] chore: Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90178c5..6f638c6 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ true ossrh - https://s01.oss.sonatype.org/ + https://oss.sonatype.org/ true From 123efadc092bc093367e37920be555c7937a8f2e Mon Sep 17 00:00:00 2001 From: Lorenz Simon Date: Sun, 22 Dec 2024 14:44:33 +0100 Subject: [PATCH 13/15] Update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 911aead..951eacc 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # Default owners -* @lorenzsimon @gimlet2 +* @lorenzsimon @gimlet2 @asyncapi-bot-eve From bc83ab4f5825d56f7741f126fce481bad57e8c6b Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Thu, 2 Jan 2025 09:04:00 -0500 Subject: [PATCH 14/15] changes per PR requests. --- .../kotlinasyncapi/context/annotation/AnnotationProvider.kt | 6 ++---- .../kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt index cdcd438..c82d852 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/org/openfolder/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -81,10 +81,8 @@ class AnnotationProvider( is Message -> messageProcessor.process(annotation, clazz) is Schema -> schemaProcessor.process(annotation, clazz) is Channel -> channelProcessor.process(annotation, clazz).also { - if (clazz.annotations.any { it is Channel }) { - componentToChannelMapping[clazz.java.simpleName] = - annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName - } + componentToChannelMapping[clazz.java.simpleName] = + annotation.value.takeIf { it.isNotEmpty() } ?: clazz.java.simpleName } is AsyncApiComponent -> asyncApiComponentProcessor.process(annotation, clazz).also { processedComponents -> processedComponents.channels?.forEach { (channelName, _) -> diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index 16170b8..d533a9e 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/org/openfolder/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -105,7 +105,7 @@ internal open class AsyncApiAnnotationAutoConfiguration { ChannelProcessor() @Bean - open fun asyncApiDocumentationProcessor() = + open fun asyncApiComponentProcessor() = AsyncApiComponentProcessor() @Bean From ca2c5d073dc6da690b2a8ec745641b0d5a634c1c Mon Sep 17 00:00:00 2001 From: Charles Bazeley Date: Mon, 6 Jan 2025 15:17:09 -0500 Subject: [PATCH 15/15] updates to handle merge conflicts. --- .../annotation/AsyncApiComponent.kt | 4 ++-- .../context/annotation/AnnotationProvider.kt | 1 + .../processor/AsyncApiComponentProcessor.kt | 12 ++++++------ .../AsyncApiComponentProcessorTest.kt | 18 +++++++++--------- .../kotlinasyncapi/ktor/AsyncApiModule.kt | 1 + .../springweb/AsyncApiAutoConfiguration.kt | 2 ++ .../AsyncApiControllerIntegrationTest.kt | 1 + 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiComponent.kt b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiComponent.kt index a04b8a6..c7c3c0f 100644 --- a/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiComponent.kt +++ b/kotlin-asyncapi-annotation/src/main/kotlin/com/asyncapi/kotlinasyncapi/annotation/AsyncApiComponent.kt @@ -1,5 +1,5 @@ -package org.openfolder.kotlinasyncapi.annotation +package com.asyncapi.kotlinasyncapi.annotation @Target(AnnotationTarget.CLASS) @AsyncApiAnnotation -annotation class AsyncApiComponent \ No newline at end of file +annotation class AsyncApiComponent \ No newline at end of file diff --git a/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt index 62871b7..2139349 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/AnnotationProvider.kt @@ -1,6 +1,7 @@ package com.asyncapi.kotlinasyncapi.context.annotation import com.asyncapi.kotlinasyncapi.annotation.AsyncApiAnnotation +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiComponent import com.asyncapi.kotlinasyncapi.annotation.Schema import com.asyncapi.kotlinasyncapi.annotation.channel.Channel import com.asyncapi.kotlinasyncapi.annotation.channel.Message diff --git a/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt index 9aae918..18ce768 100644 --- a/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt +++ b/kotlin-asyncapi-context/src/main/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessor.kt @@ -1,10 +1,10 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor -import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Publish -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.model.component.Components +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Publish +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.model.component.Components import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.functions diff --git a/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt index 97e793d..b4acdd8 100644 --- a/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt +++ b/kotlin-asyncapi-context/src/test/kotlin/com/asyncapi/kotlinasyncapi/context/annotation/processor/AsyncApiComponentProcessorTest.kt @@ -1,14 +1,14 @@ -package org.openfolder.kotlinasyncapi.context.annotation.processor +package com.asyncapi.kotlinasyncapi.context.annotation.processor import org.junit.jupiter.api.Test -import org.openfolder.kotlinasyncapi.annotation.AsyncApiComponent -import org.openfolder.kotlinasyncapi.annotation.channel.Channel -import org.openfolder.kotlinasyncapi.annotation.channel.Message -import org.openfolder.kotlinasyncapi.annotation.channel.Parameter -import org.openfolder.kotlinasyncapi.annotation.channel.SecurityRequirement -import org.openfolder.kotlinasyncapi.annotation.channel.Subscribe -import org.openfolder.kotlinasyncapi.context.TestUtils.assertJsonEquals -import org.openfolder.kotlinasyncapi.context.TestUtils.json +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiComponent +import com.asyncapi.kotlinasyncapi.annotation.channel.Channel +import com.asyncapi.kotlinasyncapi.annotation.channel.Message +import com.asyncapi.kotlinasyncapi.annotation.channel.Parameter +import com.asyncapi.kotlinasyncapi.annotation.channel.SecurityRequirement +import com.asyncapi.kotlinasyncapi.annotation.channel.Subscribe +import com.asyncapi.kotlinasyncapi.context.TestUtils.assertJsonEquals +import com.asyncapi.kotlinasyncapi.context.TestUtils.json import kotlin.reflect.full.findAnnotation internal class AsyncApiComponentProcessorTest { diff --git a/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt index c069453..2ddd5e2 100644 --- a/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt +++ b/kotlin-asyncapi-ktor/src/main/kotlin/com/asyncapi/kotlinasyncapi/ktor/AsyncApiModule.kt @@ -14,6 +14,7 @@ import com.asyncapi.kotlinasyncapi.context.PackageInfoProvider import com.asyncapi.kotlinasyncapi.context.ResourceProvider import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationProvider import com.asyncapi.kotlinasyncapi.context.annotation.DefaultAnnotationScanner +import com.asyncapi.kotlinasyncapi.context.annotation.processor.AsyncApiComponentProcessor import com.asyncapi.kotlinasyncapi.context.annotation.processor.ChannelProcessor import com.asyncapi.kotlinasyncapi.context.annotation.processor.MessageProcessor import com.asyncapi.kotlinasyncapi.context.annotation.processor.SchemaProcessor diff --git a/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt index ab567f0..6e3150f 100644 --- a/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt +++ b/kotlin-asyncapi-spring-web/src/main/kotlin/com/asyncapi/kotlinasyncapi/springweb/AsyncApiAutoConfiguration.kt @@ -1,5 +1,6 @@ package com.asyncapi.kotlinasyncapi.springweb +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiComponent import kotlin.reflect.KClass import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost @@ -13,6 +14,7 @@ import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationProvider import com.asyncapi.kotlinasyncapi.context.annotation.AnnotationScanner import com.asyncapi.kotlinasyncapi.context.annotation.DefaultAnnotationScanner import com.asyncapi.kotlinasyncapi.context.annotation.processor.AnnotationProcessor +import com.asyncapi.kotlinasyncapi.context.annotation.processor.AsyncApiComponentProcessor import com.asyncapi.kotlinasyncapi.context.annotation.processor.ChannelProcessor import com.asyncapi.kotlinasyncapi.context.annotation.processor.MessageProcessor import com.asyncapi.kotlinasyncapi.context.annotation.processor.SchemaProcessor diff --git a/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt index 04e4339..896fe49 100644 --- a/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt +++ b/kotlin-asyncapi-spring-web/src/test/kotlin/com/asyncapi/kotlinasyncapi/springweb/controller/AsyncApiControllerIntegrationTest.kt @@ -1,5 +1,6 @@ package com.asyncapi.kotlinasyncapi.springweb.controller +import com.asyncapi.kotlinasyncapi.annotation.AsyncApiComponent import org.junit.jupiter.api.Test import com.asyncapi.kotlinasyncapi.annotation.channel.Channel import com.asyncapi.kotlinasyncapi.annotation.channel.Message